Commit 445f2bda authored by Neil Armstrong's avatar Neil Armstrong Committed by Kevin Hilman
Browse files

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: default avatarNeil Armstrong <narmstrong@baylibre.com>
Signed-off-by: default avatarKevin Hilman <khilman@baylibre.com>
parent 2250e0f5

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

+2 −2
Original line number Diff line number Diff line
@@ -965,7 +965,7 @@ 


			sysctrl: system-controller@0 {

				compatible = "amlogic,meson-axg-hhi-sysctrl",

					     "syscon", "simple-mfd";

					     "simple-mfd", "syscon";

				reg = <0 0 0 0x400>;



				clkc: clock-controller {
@@ -1209,7 +1209,7 @@ 
			ranges = <0x0 0x0 0x0 0xff800000 0x0 0x100000>;



			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>;



				clkc_AO: clock-controller {

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

+2 −2
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ 
			ranges = <0x0 0x0 0x0 0xc8100000 0x0 0x100000>;



			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>;



				pwrc_vpu: power-controller-vpu {
@@ -444,7 +444,7 @@ 
			ranges = <0x0 0x0 0x0 0xc883c000 0x0 0x2000>;



			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>;

			};

CRA Git | Maintained and supported by SUSTech CRA and CCSE