Commit 994a8e8a authored by Gregory CLEMENT's avatar Gregory CLEMENT
Browse files

arm64: dts: marvell: Fully re-order nodes in Marvell CP110 dtsi files 



Since the introduction of the CP110 dt files, the sata node was
misplaced. Move it at the right place. Thanks to this, the files are
completely ordered.

Signed-off-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
parent 249112ce

arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi

+9 −9
Original line number Diff line number Diff line
@@ -162,15 +162,6 @@ 
				};

			};



			cpm_sata0: sata@540000 {

				compatible = "marvell,armada-8k-ahci",

					     "generic-ahci";

				reg = <0x540000 0x30000>;

				interrupts = <ICU_GRP_NSR 107 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&cpm_clk 1 15>;

				status = "disabled";

			};



			cpm_usb3_0: usb3@500000 {

				compatible = "marvell,armada-8k-xhci",

					     "generic-xhci";
@@ -191,6 +182,15 @@ 
				status = "disabled";

			};



			cpm_sata0: sata@540000 {

				compatible = "marvell,armada-8k-ahci",

					     "generic-ahci";

				reg = <0x540000 0x30000>;

				interrupts = <ICU_GRP_NSR 107 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&cpm_clk 1 15>;

				status = "disabled";

			};



			cpm_xor0: xor@6a0000 {

				compatible = "marvell,armada-7k-xor", "marvell,xor-v2";

				reg = <0x6a0000 0x1000>,

arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi

+9 −9
Original line number Diff line number Diff line
@@ -163,15 +163,6 @@ 


			};



			cps_sata0: sata@540000 {

				compatible = "marvell,armada-8k-ahci",

					     "generic-ahci";

				reg = <0x540000 0x30000>;

				interrupts = <ICU_GRP_NSR 107 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&cps_clk 1 15>;

				status = "disabled";

			};



			cps_usb3_0: usb3@500000 {

				compatible = "marvell,armada-8k-xhci",

					     "generic-xhci";
@@ -192,6 +183,15 @@ 
				status = "disabled";

			};



			cps_sata0: sata@540000 {

				compatible = "marvell,armada-8k-ahci",

					     "generic-ahci";

				reg = <0x540000 0x30000>;

				interrupts = <ICU_GRP_NSR 107 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&cps_clk 1 15>;

				status = "disabled";

			};



			cps_xor0: xor@6a0000 {

				compatible = "marvell,armada-7k-xor", "marvell,xor-v2";

				reg = <0x6a0000 0x1000>,

CRA Git | Maintained and supported by SUSTech CRA and CCSE