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 02/10] Revert "arm64: dts: freescale: Fix 'interrupt-map' parent address cells"
Date:   Tue, 14 Dec 2021 03:37:52 +0200
Message-Id: <20211214013800.2703568-3-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?6CBmPKef83YId35w+inbGnTcBidKY7l6ihn/Jgkre94qMbm7BwTsdGpfVR/i?=
 =?us-ascii?Q?SYFe6FGKHhTlVQ6EOYj9F22KD0p2AWvAgVGcP8EV/K2XZOdH4KVuHrDvl/aH?=
 =?us-ascii?Q?CWPRvihW5FOcfSJUTPnG0EybfARrnAejyU0mhbmlOiLcCjNsSK7Y3ZCw/XtI?=
 =?us-ascii?Q?zl0bhx6susJTGltqhckdZZtnRybn8e6zUZCfQ5GGkFaPD/+phGx78KXj3MXw?=
 =?us-ascii?Q?UONzzMzqu1sN8gOKVPKS3JGCLOX90KDwLyZM/3BTMWyGRDqm+jYFPTDCDiPF?=
 =?us-ascii?Q?mXXRHyTddakjH0D+GoSjpZQcDqLgZZh01tzsq2k0axlmode9Npxngl4P7GQX?=
 =?us-ascii?Q?GeOkDgCYY5yDwLvASd82GN9pSzXsnl9M6SUjjZMJQNqo9S/KxUtqjO0zQ2Br?=
 =?us-ascii?Q?+0vGUPjTK5fmyTb/v8b/FTkQkmBrv44kYY7sINZuVS1X7QcJkSH328NRr/ue?=
 =?us-ascii?Q?9YvXdsfcL74AosXsewtg6VZ+4EzwU6VtWrmEc62FnHNCT+Z23kgHHK84Kd/o?=
 =?us-ascii?Q?k9gIfi4qxlz9K95pvh+mQLBy+/u8uHtHO7selyc9EcgguBQacNyHo+/C0EEP?=
 =?us-ascii?Q?1DpomZNFxq7Ir8oqeVTCm0fmjQJMaBRlijo77KVEFAjerxvaqVbrDciQJVN4?=
 =?us-ascii?Q?xj5xNMHzqSNyRERVeos6L4b3Qkjo7C7/gd6YeR/ok64T5OEDkNYdIMei/w6J?=
 =?us-ascii?Q?2Ce+akj3Odc4QhHFXilCk0PPKQLg4JjoQUpTc8y0UFYyIHKFRL8yDvhNPY/u?=
 =?us-ascii?Q?7M+fu9QfXiLT9MbTbQK3R4l63ktyjt8zysgs8D7QVCQC/+NT+tcIMwfuk7xT?=
 =?us-ascii?Q?rhyKvHjn/U6P7GCllvDuKjRL73ibqUmzyKIj8mFMzyS1vmjF0nLftGUEgur9?=
 =?us-ascii?Q?agFtP+CY0NscY3lNBwP4rLFe9AV9FdYnlqTpiwO6IkcXZZ695CRbYqPyCDOX?=
 =?us-ascii?Q?YyMrGtaYiTob7TjlqSb/cOMXAmBUWCS0RiaBeFOWqAJsk0hyMENHOIDC3Scx?=
 =?us-ascii?Q?JdiDUwbkgHKTumAqmakpxclfKrnn1emyclg8vglMyteqpy3GmVtMknD+aR1G?=
 =?us-ascii?Q?tYqWMnblP6ym9T4MdsQUmCn5zqSp/FVkhbdROfivdit2VeCIAJj9fjAKmIOn?=
 =?us-ascii?Q?RcpTVB/AAR6pQ6zJGRgmdFvLfp/suDCRjLWfA0olhWERaRCPikoCcGris+KE?=
 =?us-ascii?Q?nOKFjaEPtUHvJb19bCfGeqv5THt677OivW/mF8fOgPn/Yji/55SgGxPPvuim?=
 =?us-ascii?Q?tR72KKVYIgNdKXs8oSOB4MUZFeDSVEWOidXqCI5O6x1tZQZSTxEY6vkQmiE9?=
 =?us-ascii?Q?X5KCGPrLcB1CFUjRoufTlBAl/Pkgg4WtVRKmYg7ja/J50oX4VsNAFoWDzLK1?=
 =?us-ascii?Q?SnZgX14zjb48s04iagaWWqBuRen0Wl8yIMlaVnY67lXZZxTwPTv4EbkOSEqL?=
 =?us-ascii?Q?O282WOA8V7acfnCMhU/nQb3LgEIfe4Z6kuvg/nnTxxsCLAEHBdhCey12FTjj?=
 =?us-ascii?Q?5jmHcwRa9RDORpBUFdfL3ELjCuwzhTEt8vSEEiyymMYLvXkuFsi4pZF6G+pk?=
 =?us-ascii?Q?039+LhyOedVqBfexEXq5NROyH74DpazS+eFOO8jkLBcLLvkgWpAWUIihXAtC?=
 =?us-ascii?Q?pQJK1rr0RoYxlTuvPhc3fC8=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f29015bc-a122-4965-880a-08d9bea272af
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:36.8815
 (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: WiRk/tBn8jhfEJmEGZdpX/k3nXHCPvFgIe3/3HVhFIQy4TqLAXhHmOxjqE2kGA25iDFwGuqSmumuDKohgBxMXg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6944
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

This reverts commit 869f0ec048dc8fd88c0b2003373bd985795179fb. That
updated the expected device tree binding format for the ls-extirq
driver, without also updating the parsing code to the new format.

While the fsl-extirq driver may have a non-standard format (one that
doesn't take into consideration the #address-cells of the interrupt
parent), it also has no business in making use of the "interrupt-map"
property in the first place. So the argument for the blamed patch was
kind of moot in the first place.

This change restores LS1088A, LS2088A/LS2085A and LX2160A to their
previous bindings. A follow-up change will also rename "interrupt-map"
to "fsl,extirq-map" to prevent any further automatic conversions from
causing breakage. Keeping the revert as a separate change allows those
renaming changes to look the same on kernels that include the reverted
patch as on kernels that don't.

Fixes: 869f0ec048dc ("arm64: dts: freescale: Fix 'interrupt-map' parent address cells")
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
 .../arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 24 +++++++++----------
 .../arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 24 +++++++++----------
 .../arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 24 +++++++++----------
 3 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
index f891ef6a3754..605072317243 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
@@ -241,18 +241,18 @@ extirq: interrupt-controller@14 {
 				interrupt-controller;
 				reg = <0x14 4>;
 				interrupt-map =
-					<0 0 &gic 0 0 GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
-					<1 0 &gic 0 0 GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
-					<2 0 &gic 0 0 GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
-					<3 0 &gic 0 0 GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
-					<4 0 &gic 0 0 GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>,
-					<5 0 &gic 0 0 GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>,
-					<6 0 &gic 0 0 GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>,
-					<7 0 &gic 0 0 GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,
-					<8 0 &gic 0 0 GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
-					<9 0 &gic 0 0 GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
-					<10 0 &gic 0 0 GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>,
-					<11 0 &gic 0 0 GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
+					<0 0 &gic GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
+					<1 0 &gic GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
+					<2 0 &gic GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
+					<3 0 &gic GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
+					<4 0 &gic GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>,
+					<5 0 &gic GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>,
+					<6 0 &gic GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>,
+					<7 0 &gic GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,
+					<8 0 &gic GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
+					<9 0 &gic GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
+					<10 0 &gic GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>,
+					<11 0 &gic GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
 				interrupt-map-mask = <0xffffffff 0x0>;
 			};
 		};
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
index 3cb9c21d2775..1282b61da8a5 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
@@ -293,18 +293,18 @@ extirq: interrupt-controller@14 {
 				interrupt-controller;
 				reg = <0x14 4>;
 				interrupt-map =
-					<0 0 &gic 0 0 GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
-					<1 0 &gic 0 0 GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
-					<2 0 &gic 0 0 GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
-					<3 0 &gic 0 0 GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
-					<4 0 &gic 0 0 GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>,
-					<5 0 &gic 0 0 GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>,
-					<6 0 &gic 0 0 GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>,
-					<7 0 &gic 0 0 GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,
-					<8 0 &gic 0 0 GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
-					<9 0 &gic 0 0 GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
-					<10 0 &gic 0 0 GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>,
-					<11 0 &gic 0 0 GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
+					<0 0 &gic GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
+					<1 0 &gic GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
+					<2 0 &gic GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
+					<3 0 &gic GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
+					<4 0 &gic GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>,
+					<5 0 &gic GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>,
+					<6 0 &gic GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>,
+					<7 0 &gic GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,
+					<8 0 &gic GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
+					<9 0 &gic GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
+					<10 0 &gic GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>,
+					<11 0 &gic GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
 				interrupt-map-mask = <0xffffffff 0x0>;
 			};
 		};
diff --git a/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi b/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi
index dc8661ebd1f6..c4b1a59ba424 100644
--- a/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi
@@ -680,18 +680,18 @@ extirq: interrupt-controller@14 {
 				interrupt-controller;
 				reg = <0x14 4>;
 				interrupt-map =
-					<0 0 &gic 0 0 GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
-					<1 0 &gic 0 0 GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
-					<2 0 &gic 0 0 GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
-					<3 0 &gic 0 0 GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
-					<4 0 &gic 0 0 GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>,
-					<5 0 &gic 0 0 GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>,
-					<6 0 &gic 0 0 GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>,
-					<7 0 &gic 0 0 GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,
-					<8 0 &gic 0 0 GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
-					<9 0 &gic 0 0 GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
-					<10 0 &gic 0 0 GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>,
-					<11 0 &gic 0 0 GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
+					<0 0 &gic GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
+					<1 0 &gic GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
+					<2 0 &gic GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
+					<3 0 &gic GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
+					<4 0 &gic GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>,
+					<5 0 &gic GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>,
+					<6 0 &gic GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>,
+					<7 0 &gic GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,
+					<8 0 &gic GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
+					<9 0 &gic GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
+					<10 0 &gic GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>,
+					<11 0 &gic GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
 				interrupt-map-mask = <0xffffffff 0x0>;
 			};
 		};
-- 
2.25.1