[PATCH 2/7] ARM: dts: arm/vexpress: Move "arm,vexpress,config-bus" node into sysreg node

[Rob Herring (Arm)]

The "arm,vexpress,config-bus" is accessed via the "arm,vexpress-sysreg"
registers, so it is appropriate for it to be located there rather than
in a "simple-bus" node. Under the "simple-bus" is not appropriate given
there is no MMIO space.

Unlike the prior attempt in commit d9258898ad49 ("arm64: dts: arm:
vexpress: Move fixed devices out of bus node") which got partially
reverted, the "arm,vexpress,site" property will be correctly found in a
parent node now.

Signed-off-by: Rob Herring (Arm) <robh@xxxxxxxxxx>
---
 arch/arm/boot/dts/arm/vexpress-v2m-rs1.dtsi | 146 ++++++++++++++--------------
 arch/arm/boot/dts/arm/vexpress-v2m.dtsi     | 146 ++++++++++++++--------------
 2 files changed, 146 insertions(+), 146 deletions(-)

diff --git a/arch/arm/boot/dts/arm/vexpress-v2m-rs1.dtsi b/arch/arm/boot/dts/arm/vexpress-v2m-rs1.dtsi
index 248b8e492d43..e12d44269a2f 100644
--- a/arch/arm/boot/dts/arm/vexpress-v2m-rs1.dtsi
+++ b/arch/arm/boot/dts/arm/vexpress-v2m-rs1.dtsi
@@ -233,6 +233,79 @@ v2m_flash_gpios: gpio@4c {
 						gpio-controller;
 						#gpio-cells = <2>;
 					};
+
+					mcc {
+						compatible = "arm,vexpress,config-bus";
+						arm,vexpress,config-bridge = <&v2m_sysreg>;
+
+						clock-controller-0 {
+							/* MCC static memory clock */
+							compatible = "arm,vexpress-osc";
+							arm,vexpress-sysreg,func = <1 0>;
+							freq-range = <25000000 60000000>;
+							#clock-cells = <0>;
+							clock-output-names = "v2m:oscclk0";
+						};
+
+						v2m_oscclk1: clock-controller-1 {
+							/* CLCD clock */
+							compatible = "arm,vexpress-osc";
+							arm,vexpress-sysreg,func = <1 1>;
+							freq-range = <23750000 65000000>;
+							#clock-cells = <0>;
+							clock-output-names = "v2m:oscclk1";
+						};
+
+						v2m_oscclk2: clock-controller-2 {
+							/* IO FPGA peripheral clock */
+							compatible = "arm,vexpress-osc";
+							arm,vexpress-sysreg,func = <1 2>;
+							freq-range = <24000000 24000000>;
+							#clock-cells = <0>;
+							clock-output-names = "v2m:oscclk2";
+						};
+
+						regulator-vio {
+							/* Logic level voltage */
+							compatible = "arm,vexpress-volt";
+							arm,vexpress-sysreg,func = <2 0>;
+							regulator-name = "VIO";
+							regulator-always-on;
+							label = "VIO";
+						};
+
+						temp-mcc {
+							/* MCC internal operating temperature */
+							compatible = "arm,vexpress-temp";
+							arm,vexpress-sysreg,func = <4 0>;
+							label = "MCC";
+						};
+
+						reset {
+							compatible = "arm,vexpress-reset";
+							arm,vexpress-sysreg,func = <5 0>;
+						};
+
+						muxfpga {
+							compatible = "arm,vexpress-muxfpga";
+							arm,vexpress-sysreg,func = <7 0>;
+						};
+
+						shutdown {
+							compatible = "arm,vexpress-shutdown";
+							arm,vexpress-sysreg,func = <8 0>;
+						};
+
+						reboot {
+							compatible = "arm,vexpress-reboot";
+							arm,vexpress-sysreg,func = <9 0>;
+						};
+
+						dvimode {
+							compatible = "arm,vexpress-dvimode";
+							arm,vexpress-sysreg,func = <11 0>;
+						};
+					};
 				};
 
 				v2m_sysctl: sysctl@20000 {
@@ -415,79 +488,6 @@ clcd_pads: endpoint {
 						};
 					};
 				};
-
-				mcc {
-					compatible = "arm,vexpress,config-bus";
-					arm,vexpress,config-bridge = <&v2m_sysreg>;
-
-					clock-controller-0 {
-						/* MCC static memory clock */
-						compatible = "arm,vexpress-osc";
-						arm,vexpress-sysreg,func = <1 0>;
-						freq-range = <25000000 60000000>;
-						#clock-cells = <0>;
-						clock-output-names = "v2m:oscclk0";
-					};
-
-					v2m_oscclk1: clock-controller-1 {
-						/* CLCD clock */
-						compatible = "arm,vexpress-osc";
-						arm,vexpress-sysreg,func = <1 1>;
-						freq-range = <23750000 65000000>;
-						#clock-cells = <0>;
-						clock-output-names = "v2m:oscclk1";
-					};
-
-					v2m_oscclk2: clock-controller-2 {
-						/* IO FPGA peripheral clock */
-						compatible = "arm,vexpress-osc";
-						arm,vexpress-sysreg,func = <1 2>;
-						freq-range = <24000000 24000000>;
-						#clock-cells = <0>;
-						clock-output-names = "v2m:oscclk2";
-					};
-
-					regulator-vio {
-						/* Logic level voltage */
-						compatible = "arm,vexpress-volt";
-						arm,vexpress-sysreg,func = <2 0>;
-						regulator-name = "VIO";
-						regulator-always-on;
-						label = "VIO";
-					};
-
-					temp-mcc {
-						/* MCC internal operating temperature */
-						compatible = "arm,vexpress-temp";
-						arm,vexpress-sysreg,func = <4 0>;
-						label = "MCC";
-					};
-
-					reset {
-						compatible = "arm,vexpress-reset";
-						arm,vexpress-sysreg,func = <5 0>;
-					};
-
-					muxfpga {
-						compatible = "arm,vexpress-muxfpga";
-						arm,vexpress-sysreg,func = <7 0>;
-					};
-
-					shutdown {
-						compatible = "arm,vexpress-shutdown";
-						arm,vexpress-sysreg,func = <8 0>;
-					};
-
-					reboot {
-						compatible = "arm,vexpress-reboot";
-						arm,vexpress-sysreg,func = <9 0>;
-					};
-
-					dvimode {
-						compatible = "arm,vexpress-dvimode";
-						arm,vexpress-sysreg,func = <11 0>;
-					};
-				};
 			};
 		};
 	};
diff --git a/arch/arm/boot/dts/arm/vexpress-v2m.dtsi b/arch/arm/boot/dts/arm/vexpress-v2m.dtsi
index be03f2a8a57a..2a8d1d6dfc7e 100644
--- a/arch/arm/boot/dts/arm/vexpress-v2m.dtsi
+++ b/arch/arm/boot/dts/arm/vexpress-v2m.dtsi
@@ -153,6 +153,79 @@ v2m_flash_gpios: gpio@4c {
 						gpio-controller;
 						#gpio-cells = <2>;
 					};
+
+					mcc {
+						compatible = "arm,vexpress,config-bus";
+						arm,vexpress,config-bridge = <&v2m_sysreg>;
+
+						clock-controller-0 {
+							/* MCC static memory clock */
+							compatible = "arm,vexpress-osc";
+							arm,vexpress-sysreg,func = <1 0>;
+							freq-range = <25000000 60000000>;
+							#clock-cells = <0>;
+							clock-output-names = "v2m:oscclk0";
+						};
+
+						v2m_oscclk1: clock-controller-1 {
+							/* CLCD clock */
+							compatible = "arm,vexpress-osc";
+							arm,vexpress-sysreg,func = <1 1>;
+							freq-range = <23750000 65000000>;
+							#clock-cells = <0>;
+							clock-output-names = "v2m:oscclk1";
+						};
+
+						v2m_oscclk2: clock-controller-2 {
+							/* IO FPGA peripheral clock */
+							compatible = "arm,vexpress-osc";
+							arm,vexpress-sysreg,func = <1 2>;
+							freq-range = <24000000 24000000>;
+							#clock-cells = <0>;
+							clock-output-names = "v2m:oscclk2";
+						};
+
+						regulator-vio {
+							/* Logic level voltage */
+							compatible = "arm,vexpress-volt";
+							arm,vexpress-sysreg,func = <2 0>;
+							regulator-name = "VIO";
+							regulator-always-on;
+							label = "VIO";
+						};
+
+						temp-mcc {
+							/* MCC internal operating temperature */
+							compatible = "arm,vexpress-temp";
+							arm,vexpress-sysreg,func = <4 0>;
+							label = "MCC";
+						};
+
+						reset {
+							compatible = "arm,vexpress-reset";
+							arm,vexpress-sysreg,func = <5 0>;
+						};
+
+						muxfpga {
+							compatible = "arm,vexpress-muxfpga";
+							arm,vexpress-sysreg,func = <7 0>;
+						};
+
+						shutdown {
+							compatible = "arm,vexpress-shutdown";
+							arm,vexpress-sysreg,func = <8 0>;
+						};
+
+						reboot {
+							compatible = "arm,vexpress-reboot";
+							arm,vexpress-sysreg,func = <9 0>;
+						};
+
+						dvimode {
+							compatible = "arm,vexpress-dvimode";
+							arm,vexpress-sysreg,func = <11 0>;
+						};
+					};
 				};
 
 				v2m_sysctl: sysctl@1000 {
@@ -431,79 +504,6 @@ led-user8 {
 					linux,default-trigger = "cpu5";
 				};
 			};
-
-			mcc {
-				compatible = "arm,vexpress,config-bus";
-				arm,vexpress,config-bridge = <&v2m_sysreg>;
-
-				clock-controller-0 {
-					/* MCC static memory clock */
-					compatible = "arm,vexpress-osc";
-					arm,vexpress-sysreg,func = <1 0>;
-					freq-range = <25000000 60000000>;
-					#clock-cells = <0>;
-					clock-output-names = "v2m:oscclk0";
-				};
-
-				v2m_oscclk1: clock-controller-1 {
-					/* CLCD clock */
-					compatible = "arm,vexpress-osc";
-					arm,vexpress-sysreg,func = <1 1>;
-					freq-range = <23750000 65000000>;
-					#clock-cells = <0>;
-					clock-output-names = "v2m:oscclk1";
-				};
-
-				v2m_oscclk2: clock-controller-2 {
-					/* IO FPGA peripheral clock */
-					compatible = "arm,vexpress-osc";
-					arm,vexpress-sysreg,func = <1 2>;
-					freq-range = <24000000 24000000>;
-					#clock-cells = <0>;
-					clock-output-names = "v2m:oscclk2";
-				};
-
-				regulator-vio {
-					/* Logic level voltage */
-					compatible = "arm,vexpress-volt";
-					arm,vexpress-sysreg,func = <2 0>;
-					regulator-name = "VIO";
-					regulator-always-on;
-					label = "VIO";
-				};
-
-				temp-mcc {
-					/* MCC internal operating temperature */
-					compatible = "arm,vexpress-temp";
-					arm,vexpress-sysreg,func = <4 0>;
-					label = "MCC";
-				};
-
-				reset {
-					compatible = "arm,vexpress-reset";
-					arm,vexpress-sysreg,func = <5 0>;
-				};
-
-				muxfpga {
-					compatible = "arm,vexpress-muxfpga";
-					arm,vexpress-sysreg,func = <7 0>;
-				};
-
-				shutdown {
-					compatible = "arm,vexpress-shutdown";
-					arm,vexpress-sysreg,func = <8 0>;
-				};
-
-				reboot {
-					compatible = "arm,vexpress-reboot";
-					arm,vexpress-sysreg,func = <9 0>;
-				};
-
-				dvimode {
-					compatible = "arm,vexpress-dvimode";
-					arm,vexpress-sysreg,func = <11 0>;
-				};
-			};
 		};
 	};
 };

-- 
2.53.0