From: Linus Walleij <linus.walleij@linaro.org>
Date: Sun, 4 Dec 2022 19:02:28 +0000 (+0100)
Subject: ARM: dts: gemini: Push down flash address/size cells
X-Git-Tag: v6.3-rc1~202^2~51^2~4
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=41054628c45e300e3174f6a0b1a33f30ccb6b591;p=tomoyo%2Ftomoyo-test1.git

ARM: dts: gemini: Push down flash address/size cells

The platforms not defining any OF partions complain like
this:

../arch/arm/boot/dts/gemini.dtsi:19.25-28.5: Warning
 (avoid_unnecessary_addr_size): /soc/flash@30000000: unnecessary
 #address-cells/#size-cells without "ranges" or child "reg" property

Get rid of this by only defining the address-cells and
size-cells where it is actually used by OF partitions.

Link: https://lore.kernel.org/r/20221204190230.3345590-1-linus.walleij@linaro.org
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---

diff --git a/arch/arm/boot/dts/gemini-dlink-dns-313.dts b/arch/arm/boot/dts/gemini-dlink-dns-313.dts
index eba1c94ed7f7..fbbea139defc 100644
--- a/arch/arm/boot/dts/gemini-dlink-dns-313.dts
+++ b/arch/arm/boot/dts/gemini-dlink-dns-313.dts
@@ -164,6 +164,8 @@
 			compatible = "cortina,gemini-flash", "jedec-flash";
 			status = "okay";
 			reg = <0x30000000 0x00080000>;
+			#address-cells = <1>;
+			#size-cells = <1>;
 
 			/*
 			 * This "RedBoot" is the Storlink derivative.
diff --git a/arch/arm/boot/dts/gemini-wbd111.dts b/arch/arm/boot/dts/gemini-wbd111.dts
index de3c4416b0fb..bfb7fdd589ae 100644
--- a/arch/arm/boot/dts/gemini-wbd111.dts
+++ b/arch/arm/boot/dts/gemini-wbd111.dts
@@ -86,6 +86,8 @@
 			status = "okay";
 			/* 8MB of flash */
 			reg = <0x30000000 0x00800000>;
+			#address-cells = <1>;
+			#size-cells = <1>;
 
 			partition@0 {
 				label = "RedBoot";
diff --git a/arch/arm/boot/dts/gemini-wbd222.dts b/arch/arm/boot/dts/gemini-wbd222.dts
index e5ceaadbcc1a..82a08e359198 100644
--- a/arch/arm/boot/dts/gemini-wbd222.dts
+++ b/arch/arm/boot/dts/gemini-wbd222.dts
@@ -90,6 +90,8 @@
 			status = "okay";
 			/* 8MB of flash */
 			reg = <0x30000000 0x00800000>;
+			#address-cells = <1>;
+			#size-cells = <1>;
 
 			partition@0 {
 				label = "RedBoot";
diff --git a/arch/arm/boot/dts/gemini.dtsi b/arch/arm/boot/dts/gemini.dtsi
index e836bd0818d4..3ed04d2f394c 100644
--- a/arch/arm/boot/dts/gemini.dtsi
+++ b/arch/arm/boot/dts/gemini.dtsi
@@ -22,8 +22,6 @@
 			pinctrl-names = "default";
 			pinctrl-0 = <&pflash_default_pins>;
 			bank-width = <2>;
-			#address-cells = <1>;
-			#size-cells = <1>;
 			status = "disabled";
 		};