Эх сурвалжийг харах

arm64: dts: meson: Switch simple-mfd and syscon order

The order between "syscon" and "simple-mfd" is important because in these
particular cases, the node needs to be first a "simple-mfd" to expose
it's sub-nodes, and later on a "syscon" to permit other nodes to access
this register space through the "syscon" mechanism.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
Neil Armstrong 7 жил өмнө
parent
commit
445f2bda35

+ 2 - 2
arch/arm64/boot/dts/amlogic/meson-axg.dtsi

@@ -965,7 +965,7 @@
 
 
 			sysctrl: system-controller@0 {
 			sysctrl: system-controller@0 {
 				compatible = "amlogic,meson-axg-hhi-sysctrl",
 				compatible = "amlogic,meson-axg-hhi-sysctrl",
-					     "syscon", "simple-mfd";
+					     "simple-mfd", "syscon";
 				reg = <0 0 0 0x400>;
 				reg = <0 0 0 0x400>;
 
 
 				clkc: clock-controller {
 				clkc: clock-controller {
@@ -1209,7 +1209,7 @@
 			ranges = <0x0 0x0 0x0 0xff800000 0x0 0x100000>;
 			ranges = <0x0 0x0 0x0 0xff800000 0x0 0x100000>;
 
 
 			sysctrl_AO: sys-ctrl@0 {
 			sysctrl_AO: sys-ctrl@0 {
-				compatible = "amlogic,meson-axg-ao-sysctrl", "syscon", "simple-mfd";
+				compatible = "amlogic,meson-axg-ao-sysctrl", "simple-mfd", "syscon";
 				reg =  <0x0 0x0 0x0 0x100>;
 				reg =  <0x0 0x0 0x0 0x100>;
 
 
 				clkc_AO: clock-controller {
 				clkc_AO: clock-controller {

+ 2 - 2
arch/arm64/boot/dts/amlogic/meson-gx.dtsi

@@ -344,7 +344,7 @@
 			ranges = <0x0 0x0 0x0 0xc8100000 0x0 0x100000>;
 			ranges = <0x0 0x0 0x0 0xc8100000 0x0 0x100000>;
 
 
 			sysctrl_AO: sys-ctrl@0 {
 			sysctrl_AO: sys-ctrl@0 {
-				compatible = "amlogic,meson-gx-ao-sysctrl", "syscon", "simple-mfd";
+				compatible = "amlogic,meson-gx-ao-sysctrl", "simple-mfd", "syscon";
 				reg =  <0x0 0x0 0x0 0x100>;
 				reg =  <0x0 0x0 0x0 0x100>;
 
 
 				pwrc_vpu: power-controller-vpu {
 				pwrc_vpu: power-controller-vpu {
@@ -444,7 +444,7 @@
 			ranges = <0x0 0x0 0x0 0xc883c000 0x0 0x2000>;
 			ranges = <0x0 0x0 0x0 0xc883c000 0x0 0x2000>;
 
 
 			sysctrl: system-controller@0 {
 			sysctrl: system-controller@0 {
-				compatible = "amlogic,meson-gx-hhi-sysctrl", "syscon", "simple-mfd";
+				compatible = "amlogic,meson-gx-hhi-sysctrl", "simple-mfd", "syscon";
 				reg = <0 0 0 0x400>;
 				reg = <0 0 0 0x400>;
 			};
 			};