From:   Vladimir Oltean <vladimir.oltean@nxp.com>
To:     devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
        linux-arm-kernel@lists.infradead.org
Cc:     Marc Zyngier <maz@kernel.org>, Rob Herring <robh+dt@kernel.org>,
        Shawn Guo <shawnguo@kernel.org>, Li Yang <leoyang.li@nxp.com>,
        Biwen Li <biwen.li@nxp.com>,
        Zhiqiang Hou <Zhiqiang.Hou@nxp.com>,
        Kurt Kanzenbach <kurt@linutronix.de>,
        Rasmus Villemoes <linux@rasmusvillemoes.dk>
Subject: [RFC PATCH devicetree 05/10] arm64: dts: ls1046a: rename the "interrupt-map" of the extirq node to "fsl,extirq-map"
Date:   Tue, 14 Dec 2021 03:37:55 +0200
Message-Id: <20211214013800.2703568-6-vladimir.oltean@nxp.com>
In-Reply-To: <20211214013800.2703568-1-vladimir.oltean@nxp.com>
References: <20211214013800.2703568-1-vladimir.oltean@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?xdTJyyfYlEE6JqluvnuqXnAt45OCldlj0euya531HBqpismsoYk0moDQykzO?=
 =?us-ascii?Q?hGNcCSB2+n0nzg4gfGzwL+MJtpCuWvm/cj6f8Hg02JXSVCXsDi4Jn5Udpm0i?=
 =?us-ascii?Q?A9DuxHZw+plKOq+kXMh8nQ1Eoxj3c0WfHpqmKxR+/3cInnGh0ybP6O00sLEI?=
 =?us-ascii?Q?VG3l3PuQVhKVBYHx1nprTrNHSCLZ6MneFUgMX3QZMn1oYjpYlvvmr1Ez9EFZ?=
 =?us-ascii?Q?pdEWA0Q+oq4t+u+1Uv/Jg3zZAjSeDB265j2E9wAT56xY6kl5QqzSd4uGPahu?=
 =?us-ascii?Q?Mw+cAZkiWxPVYRrbMIaZaWUxnL3jNx7CNurg7JbpLbgcJ6HXmCrsJ2k76cSh?=
 =?us-ascii?Q?I7kBQwenEBAFq2CorFABjzeBmsdgzJUDLI7ApBbL+Mew+rkF/gbSQ0BTF3AS?=
 =?us-ascii?Q?3lJ4CWJHHtVWYKUpgssTu/HGISAiVxy+x35cf6CJRhCXnazJ6edijACN/WDM?=
 =?us-ascii?Q?Iyd6kjQ0bBO8K2KsOy+FZ++F97R0totaXpNBAdyz9olPnPq5ZWlnzUHXWsGR?=
 =?us-ascii?Q?FvBOJoWkfODjYzxTZQobMO/DNu4jy//NmoH3V1cl9TvIHK5kvTnbpseEOMV+?=
 =?us-ascii?Q?tipSH7/2wD9Gc7I4ohITpGrYpCgzn1fiGxJjuOnOLIndq2yNMBo8cxYYbRJA?=
 =?us-ascii?Q?c7XEj140/MCQ5J3Qp6PUe+PXVRo5mWckBtSqR+Ve2Z7oJ4WP5ao54McO54NZ?=
 =?us-ascii?Q?FEbR+fu5DQEwDmLO7FD79WlYsBYZgLuWIhO5ebgtEFjXIR9LYDUlmMHoauxJ?=
 =?us-ascii?Q?s5gUs0OLWbMVRxFIcpEEWkRW5v13Xl7ieeMZD0Rvf8yIsonj8qMwA2jJn6zg?=
 =?us-ascii?Q?xf9gX05jJ4D6qtcS5biD11EtZLAn5LjQXG8xbIa2cc3NRwQAHrHlVNwIZnf1?=
 =?us-ascii?Q?d/Dz7p1yQD1VvSIZ2bZbtbP2qnocO3WRhu34kkyUEzVrjTNEbMGMOVKtrVoE?=
 =?us-ascii?Q?wqgzBeQJ5EgdUKx8wCzuwVqF4t0DnReQM9bqEu3kN0EPw4z9DFArDP8do4xr?=
 =?us-ascii?Q?r1FhnQ7tgeeeZCLZTo0Glps7E/LSBXvr2SrP6/lyrFRUsj0HfZb01XC9iRdc?=
 =?us-ascii?Q?++TuIDPBrwASFUk9dIFCbj9rxEp4CWR8hDJSodWiT76mqfu9B7vR3M/5P8EF?=
 =?us-ascii?Q?j9GRSwYH+SuYExvSjkCK1mUz7gWqISDK7veIED6L3O30eiPPtG9pDbpSL3nC?=
 =?us-ascii?Q?pBkMDmyI+2flX7GoiLOdHuxF1Wd7Mds+JBX0RsGKtxfM5+GJ+rPeE5i0wMOs?=
 =?us-ascii?Q?UZ4cJdSvBArA8BJvFNRu/0gUiM7ADVT8Il6DdpyF1TbsM+JW4YkHsz7oGxZH?=
 =?us-ascii?Q?gHpP3TwbmmVm3W3VUPKUplLuW0OBZCRQEktXX+Z20T7EnzrKPEcmBHuH3Ull?=
 =?us-ascii?Q?6ecpZ3VmdwQvuZ1czU7KchzTquzmgd9E03XvBZJtOzBG/CuQbd6VcATp+ORS?=
 =?us-ascii?Q?qstTlvVrAZ1Pm8PvwpiyQIh2/2gccHtLx+6OVK9b51Ny7Dug8NAxxzJlfExk?=
 =?us-ascii?Q?fQcxp9qHUiDcpQBG2yhk0AumV0EUTk5VZhs6R7rNIt5GbZoZgOoluqG7eZFD?=
 =?us-ascii?Q?n5ZlmzhqE54jPHadWX1USazZp4Elz0rdC2T434LhwL9OX3LMK8xNrjSJ0HUP?=
 =?us-ascii?Q?gpHAiuJ7zuRYZxsYl1yhbOA=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 3570e709-0199-4421-164b-08d9bea274cf
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Dec 2021 01:38:40.4906
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: TpyX+SD7i420TKVVr8hyP/VoDNUbB/OwfAzgn/pmPWrN6ccALvxoE4+Z8ocsSG3n4HmQga9CT5Uv2gQ02+yj1g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6944
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

In the discussions here:
https://lore.kernel.org/all/CAMuHMdXM34nNz1nfowNqDvdsdg+d69Bo3_ufs6fbcq65iYd5-A@mail.gmail.com/T/#m3449390080c5a0c8f59b8f8286a87e31e093b98b
Marc Zyngier points out that the ls-extirq driver should have never used
the "interrupt-map" keyword for mapping its channels to GIC interrupts.

This change modifies the device trees for the LS1046A to use a
driver-specific OF property for that purpose. The change is intended to
target stable kernels, to accelerate the conversion and ultimate removal
of the improperly used "interrupt-map" property.

Note that "interrupt-map-mask" isn't needed now (nor was it needed
before, it was just there to keep an apparent compatibility in form with
the reserved "interrupt-map" property). So delete it.

Fixes: 7968344126e5 ("arm64: dts: ls1046a: add DT node for external interrupt lines")
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
 arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
index 687fea6d8afa..c735469010b7 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
@@ -328,7 +328,7 @@ extirq: interrupt-controller@1ac {
 				#address-cells = <0>;
 				interrupt-controller;
 				reg = <0x1ac 4>;
-				interrupt-map =
+				fsl,extirq-map =
 					<0 0 &gic GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>,
 					<1 0 &gic GIC_SPI 132 IRQ_TYPE_LEVEL_HIGH>,
 					<2 0 &gic GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>,
@@ -341,7 +341,6 @@ extirq: interrupt-controller@1ac {
 					<9 0 &gic GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH>,
 					<10 0 &gic GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>,
 					<11 0 &gic GIC_SPI 151 IRQ_TYPE_LEVEL_HIGH>;
-				interrupt-map-mask = <0xffffffff 0x0>;
 			};
 		};
 
-- 
2.25.1