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 09/10] ARM: dts: ls1021a: rename the "interrupt-map" of the extirq node to "fsl,extirq-map"
Date:   Tue, 14 Dec 2021 03:37:59 +0200
Message-Id: <20211214013800.2703568-10-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?mAoY6XLwiO0kFBTaJnk8Avg/+Vdc6Tp7yPlzxp3R9/j0Ez2ik7gKbqGnDAxK?=
 =?us-ascii?Q?OToHp1YczI5MmW7Y9Gh7i43JozhRWSyzZxVCvdl/dqPAWzbDID3d6MNG51iM?=
 =?us-ascii?Q?+vsaMoa/UJ6dFL9fWHRARrqRGvFGogJofjd1HzUcvBqg6/hA0SOQvcDcs8hl?=
 =?us-ascii?Q?9saEFCGADfDtxlAqurQglVW0rs+cXc+NvGiraviZU7eIylzts4sMF0Hyufj/?=
 =?us-ascii?Q?WxSD2aktpNl/2FNfNXlYYCkaoDIAdBKXSnkVhlPnsl4mX5BtbJ61GbarK1M+?=
 =?us-ascii?Q?2W56JUg1x0ov9+AZPDDE68urEqf8BV3ojSpcPDXq5Eg7Il/klN9VItIwSi84?=
 =?us-ascii?Q?HD67k3z8RtiOvkyVIBbkP0uuQsAZPvpM8/DXZJxz3ugk9GCA59xwl2HheicL?=
 =?us-ascii?Q?4aLce6XGrB6lkaAsiNJI5Bgapgg/6BqolR7BIhmUwI44/KJMyzb1OmBbgqas?=
 =?us-ascii?Q?JnMpelZv3fTvnasRkuKw5jPHG69/q9ZQg++Og5maZg74w0WXYTyGw4T7ygGr?=
 =?us-ascii?Q?3aRthLhA+iAHKal77iYybo+GOjb1oBp07hwIp0j65eflNxI5kP+n8XYSgqAc?=
 =?us-ascii?Q?YuCmZ+ZqLzxmwvn4NbhoIZ3plIqhez4rNQctB+uBir4e6JYLP5Rnfvd+npsl?=
 =?us-ascii?Q?VuFXB/6c12zLbEeM1wUUzj84emHDy+pbcTqkmQDCqyOgifAiuHLfb73ZieDz?=
 =?us-ascii?Q?l7Jezkz4EdL9OESV7QHMM392xQRDswoXPWxTQ5y2LGU/pOoz+O+U+uQj6SXq?=
 =?us-ascii?Q?0H4FOUBW9C/j4VO/cPYazh77YDvA1xqsQxhAbw41Ee4zNse8a+nsEBJUfPxz?=
 =?us-ascii?Q?e5z8CddpSzJJycDLjUVmfGfy9k/6ZTbAj9qA2/AUEBC1SPrOWa602GQyFnQn?=
 =?us-ascii?Q?+7ey4v394XEBjXoIqH0isC7l5L4q+IGWqK4geIVsJaxAn+/VM2WTHKfyzHY3?=
 =?us-ascii?Q?OGpxlr0QUy8xELfqhxMvfN9ABoCu170Zzp7a9yH/SFcwRDjlM1kVljQf8by+?=
 =?us-ascii?Q?XStlXLHQbaEhAeqGbYd6lsw5uAjJh99EKBIDUXB0/giZqdEu/Y26VlsEi2gy?=
 =?us-ascii?Q?07mPBobBY458ywbsOC9hztYzFoPkq6T13bV8iuJzyOCFm165omSQQBqWBfvN?=
 =?us-ascii?Q?/QfLLBNzkAMAsGJJ+x52OGTR8WC4dgerBO+rwMfoEHLEnmoKSxvWCVil/GJU?=
 =?us-ascii?Q?fE0CjO/JTapeRirpTvFGbi/5WNNoekiKvwXc6IHfukdcXmlOThFHzclsZlCx?=
 =?us-ascii?Q?m7cKVjax+3EFXwYyG7JRpD7MxJu2Tqi3AJJAV3h1N/qPxI1oJSnu70qIwRQn?=
 =?us-ascii?Q?ZO1yu9tWDuwzPd5ECvZN3cMuSD0JQREUCyDpTTtBR1qK3OqRFaIoYDBtXcO/?=
 =?us-ascii?Q?GZJMLoL2LMWJrh7d3lc8KMi68kIoAO4OUSnfb7+E1drkfu2mdA1UBClZCgmA?=
 =?us-ascii?Q?KfT6KTtase5PkHNMb5RyFlkgSBMqgnksCWroNyLz2GHV0InuyKFiEqwjsKLG?=
 =?us-ascii?Q?MxjamPoB0q6/QeDa/Y8LEmLOiIsk+Wim+LtqWygd3ir9V+UprWNXpAagMyB7?=
 =?us-ascii?Q?XArX2wr+f7v3r6X8gHAs1yVm7CyEM6vtTxqGwPkGnAnH6I4Fkxrx8Gt5ANJT?=
 =?us-ascii?Q?wsqWlYPIAnmlnK2imeC/SO4=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e97306ec-62f7-403e-9899-08d9bea277a8
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:45.2402
 (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: UDkSJSJ7qt5fAGVrfrkzQuPkHKUCN/Nf5ug4eC9NmDrmhQg9qQGbhgs4FFlxQWGCsFHb/YE6u3nvK3Yk1BJPkg==
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 LS1021A 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: d27f9d634c9b ("ARM: dts: ls1021a: add node describing external interrupt lines")
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
 arch/arm/boot/dts/ls1021a.dtsi | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/ls1021a.dtsi b/arch/arm/boot/dts/ls1021a.dtsi
index 2e69d6eab4d1..1efdfeb9c110 100644
--- a/arch/arm/boot/dts/ls1021a.dtsi
+++ b/arch/arm/boot/dts/ls1021a.dtsi
@@ -185,14 +185,13 @@ extirq: interrupt-controller@1ac {
 				#address-cells = <0>;
 				interrupt-controller;
 				reg = <0x1ac 4>;
-				interrupt-map =
+				fsl,extirq-map =
 					<0 0 &gic GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>,
 					<1 0 &gic GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>,
 					<2 0 &gic GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>,
 					<3 0 &gic GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>,
 					<4 0 &gic GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>,
 					<5 0 &gic GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>;
-				interrupt-map-mask = <0xffffffff 0x0>;
 			};
 		};
 
-- 
2.25.1