From: Michal Simek <michal.simek@amd.com>
Date: Tue, 7 Jan 2025 07:01:33 +0000 (+0100)
Subject: ARM: zynq: Do not define address/size-cells for nand-controller
X-Git-Tag: v6.15-rc1~159^2~10^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6fd90200aae269daa2f0e86be7bf50246837f9f4;p=thirdparty%2Fkernel%2Flinux.git

ARM: zynq: Do not define address/size-cells for nand-controller

There is no reason to define address/size-cells without defining child
nodes in zynq-7000.dtsi. Define it in board file instead.

Signed-off-by: Michal Simek <michal.simek@amd.com>
Link: https://lore.kernel.org/r/7a3b9eb256b90ea19d35f8bbe3fd311890767974.1736233292.git.michal.simek@amd.com
---

diff --git a/arch/arm/boot/dts/xilinx/zynq-7000.dtsi b/arch/arm/boot/dts/xilinx/zynq-7000.dtsi
index 4a29216a6d642..153b8d93cbee2 100644
--- a/arch/arm/boot/dts/xilinx/zynq-7000.dtsi
+++ b/arch/arm/boot/dts/xilinx/zynq-7000.dtsi
@@ -303,8 +303,6 @@
 				compatible = "arm,pl353-nand-r2p1";
 				reg = <0 0 0x1000000>;
 				status = "disabled";
-				#address-cells = <1>;
-				#size-cells = <0>;
 			};
 			nor0: flash@1,0 {
 				status = "disabled";
diff --git a/arch/arm/boot/dts/xilinx/zynq-ebaz4205.dts b/arch/arm/boot/dts/xilinx/zynq-ebaz4205.dts
index 53fa6dbfd8fdf..14f644156a6f4 100644
--- a/arch/arm/boot/dts/xilinx/zynq-ebaz4205.dts
+++ b/arch/arm/boot/dts/xilinx/zynq-ebaz4205.dts
@@ -51,6 +51,8 @@
 &nfc0 {
 	status = "okay";
 
+	#address-cells = <1>;
+	#size-cells = <0>;
 	nand@0 {
 		reg = <0>;
 	};