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 04/10] arm64: dts: ls1043a: rename the "interrupt-map" of the extirq node to "fsl,extirq-map"
Date:   Tue, 14 Dec 2021 03:37:54 +0200
Message-Id: <20211214013800.2703568-5-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?tKM50s1fghKnaHigu7hXDeY6ZgUnv3Rt/BYhc27Tc8cH/Yvq8PUd7kRWaWGa?=
 =?us-ascii?Q?NtUvcKML/qgngH//AIb4zSL5XqW155caeESpqNmd4/520pgfyvkYqWKaPT2r?=
 =?us-ascii?Q?/PfC62K2eu+n+QavABUI66iKhyZ2sYNnT84E5Q6TZRB6cSFr0jRAe/4hFZuL?=
 =?us-ascii?Q?TavxKd9FXgsXqomzquiWDcjnlMJmw0cl8kZw9NUXDp4T3PlG/FWH86sTYipr?=
 =?us-ascii?Q?Co1CCza0Jc7kR5+Ou96RR7BlngDEGuix1MQydQCNhyf4YA0Vx3gMUUSa2tDm?=
 =?us-ascii?Q?fgO1ZOwBt/QgAnrOSq/7lucEUU2K93nuzOOrigU6RXyhNoZHJDw89OBlC64p?=
 =?us-ascii?Q?7wTbvszLqmtAZbZNtyW6BmhEdJ20pbaLYasbYr8YAhvTXmV5VWRpHS3ATP80?=
 =?us-ascii?Q?8DnQd0mRnlEA43KDaO9DPL8Bm66USjjYLvWjGNWfSLhC08yabYFtMZ39q0MU?=
 =?us-ascii?Q?tViJs1EmRixWYqM+Le0zH974NHLcJMLMKTJP1ue4A9Apxk87oUCUsvF0bWP0?=
 =?us-ascii?Q?pC8hkIvNQ25sKrQobS4soQfeplimsTTeBL0KQnlZfqUpVPC9zyhkeUW0+gkE?=
 =?us-ascii?Q?kJOWZLcYmYmK9Z19Y/h4KqjlqDkxwjpuLAuyLxOSJ2yVZj+EDR6yvshVu3Qm?=
 =?us-ascii?Q?KlHSS/p3IV7mNbpRFENZFQQl/Qkh7FGIHbCOs2i7+d+cvqiA+ebddVLYWq+J?=
 =?us-ascii?Q?oqGLVAhJiTkEAILas+UkdKnjMmjqvsybNAoTFXDZvK654YlYF3dJLIv5q67K?=
 =?us-ascii?Q?4y+vKpYasDKRLgAnze7kR9Tife5HWXDJ+yfteL3woklJoAN/un2Ngr8Wbc9p?=
 =?us-ascii?Q?ipRdLRkHgobSQm552lpvHyy4E4QX7qnQf+z/ZLm6uBgD4iiw40JHh1OfM8mi?=
 =?us-ascii?Q?mFJ5uzAo+RlTTYsE7W3Jd6mwoe0stUE/WZlETUP/Bmyml5448FsVJ6sbEcbI?=
 =?us-ascii?Q?1SUIIHbZNUpug+ybf69NGPpejuIhPiJZRUCWsrfMmwqNyuXdj4bAxgNUudi8?=
 =?us-ascii?Q?U31q8JoTGBqwFR/ni3cwm0mNI3w4DoAWO59g6Z5vsSplqAzcnkkQQ9Wm2Zlj?=
 =?us-ascii?Q?tQmTcbE0kiIix0liu7OdYamCamCZ/UODI6uWuIOu03RrEr7Ffn3N967bMQlt?=
 =?us-ascii?Q?CQts/O4qc4xq2lCG9FHjpsrMO0R9AnTC6IgP8uaKRzJ5fzpLpibiHI7T9vnN?=
 =?us-ascii?Q?CSu0M0mRrCiioVHMcK8ejshQqLDFLevDqNFKOfgm1yABuLy8pBAj5pbupP5S?=
 =?us-ascii?Q?R6uiaDItvotKI5vIteEkc7U8QK9LS5RY7a525DCpYpCUgDAFa3a0Dj2Sln1u?=
 =?us-ascii?Q?cajeuzKTCoiT4Q40ZzgVUHLMmm6HVxPo7iz9P92pAczIAetskFRk4Iw7JHuD?=
 =?us-ascii?Q?yi7cdmVVcmye5Ld+Y2uEHFr+SR9EP74Q4ZQsYYVNH1zrkhE7F91SCJP1CyX1?=
 =?us-ascii?Q?u1139O9ToIFKHePqiLqn6/J+ZMtwxhpiBdKBP1gJGqvsFIEkrDXOAX6N/pD3?=
 =?us-ascii?Q?ATm1eOQvvPt3jrRKwpYMza/4tXCwG+Vv403hDPC7Ez6VkiSQhHDf2aGNRHQK?=
 =?us-ascii?Q?a2QTuO5ISBYK6OO5DRzZrPWKHZncmk3jVqsTl7iN90zi4/df//rZRiDUCnkp?=
 =?us-ascii?Q?fO29y87ceQoSF+BU0B9CHlw=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 05c6bc96-5260-4f56-e6ec-08d9bea27419
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:39.3032
 (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: soOXfQqFFPV6L2cc/uOHA+mGabu9Pba3aKxN1j7f85qkgXWNmFRyboikbXqIAQx2WsClcNd15Y0asGOx/wEKVQ==
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 LS1043A 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: 3f8c61a567eb ("arm64: dts: ls1043a: add DT node for external interrupt lines")
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
 arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
index 01b01e320411..62958b784171 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
@@ -322,7 +322,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>,
@@ -335,7 +335,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