Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a095b1c7 authored by Jason Cooper's avatar Jason Cooper
Browse files

ARM: mvebu: sort DT nodes by address 



Prevent future unnecessary merge conflicts

Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 6226cf18

arch/arm/boot/dts/armada-370-xp.dtsi

+88 −88
Original line number Diff line number Diff line
@@ -103,22 +103,52 @@ 
			#size-cells = <1>;

			ranges = <0 MBUS_ID(0xf0, 0x01) 0 0x100000>;



			mbusc: mbus-controller@20000 {

				compatible = "marvell,mbus-controller";

				reg = <0x20000 0x100>, <0x20180 0x20>;

			rtc@10300 {

				compatible = "marvell,orion-rtc";

				reg = <0x10300 0x20>;

				interrupts = <50>;

			};



			mpic: interrupt-controller@20000 {

				compatible = "marvell,mpic";

				#interrupt-cells = <1>;

				#size-cells = <1>;

				interrupt-controller;

				msi-controller;

			spi0: spi@10600 {

				compatible = "marvell,orion-spi";

				reg = <0x10600 0x28>;

				#address-cells = <1>;

				#size-cells = <0>;

				cell-index = <0>;

				interrupts = <30>;

				clocks = <&coreclk 0>;

				status = "disabled";

			};



			coherency-fabric@20200 {

				compatible = "marvell,coherency-fabric";

				reg = <0x20200 0xb0>, <0x21810 0x1c>;

			spi1: spi@10680 {

				compatible = "marvell,orion-spi";

				reg = <0x10680 0x28>;

				#address-cells = <1>;

				#size-cells = <0>;

				cell-index = <1>;

				interrupts = <92>;

				clocks = <&coreclk 0>;

				status = "disabled";

			};



			i2c0: i2c@11000 {

				compatible = "marvell,mv64xxx-i2c";

				#address-cells = <1>;

				#size-cells = <0>;

				interrupts = <31>;

				timeout-ms = <1000>;

				clocks = <&coreclk 0>;

				status = "disabled";

			};



			i2c1: i2c@11100 {

				compatible = "marvell,mv64xxx-i2c";

				#address-cells = <1>;

				#size-cells = <0>;

				interrupts = <32>;

				timeout-ms = <1000>;

				clocks = <&coreclk 0>;

				status = "disabled";

			};



			serial@12000 {
@@ -146,25 +176,41 @@ 
				clock-output-names = "nand";

			};



			mbusc: mbus-controller@20000 {

				compatible = "marvell,mbus-controller";

				reg = <0x20000 0x100>, <0x20180 0x20>;

			};



			mpic: interrupt-controller@20000 {

				compatible = "marvell,mpic";

				#interrupt-cells = <1>;

				#size-cells = <1>;

				interrupt-controller;

				msi-controller;

			};



			coherency-fabric@20200 {

				compatible = "marvell,coherency-fabric";

				reg = <0x20200 0xb0>, <0x21810 0x1c>;

			};



			timer@20300 {

				reg = <0x20300 0x30>, <0x21040 0x30>;

				interrupts = <37>, <38>, <39>, <40>, <5>, <6>;

			};



			sata@a0000 {

				compatible = "marvell,orion-sata";

				reg = <0xa0000 0x5000>;

				interrupts = <55>;

				clocks = <&gateclk 15>, <&gateclk 30>;

				clock-names = "0", "1";

			usb@50000 {

				compatible = "marvell,orion-ehci";

				reg = <0x50000 0x500>;

				interrupts = <45>;

				status = "disabled";

			};



			mdio {

				#address-cells = <1>;

				#size-cells = <0>;

				compatible = "marvell,orion-mdio";

				reg = <0x72004 0x4>;

			usb@51000 {

				compatible = "marvell,orion-ehci";

				reg = <0x51000 0x500>;

				interrupts = <46>;

				status = "disabled";

			};



			eth0: ethernet@70000 {
@@ -175,6 +221,13 @@ 
				status = "disabled";

			};



			mdio {

				#address-cells = <1>;

				#size-cells = <0>;

				compatible = "marvell,orion-mdio";

				reg = <0x72004 0x4>;

			};



			eth1: ethernet@74000 {

				compatible = "marvell,armada-370-neta";

				reg = <0x74000 0x4000>;
@@ -183,32 +236,25 @@ 
				status = "disabled";

			};



			i2c0: i2c@11000 {

				compatible = "marvell,mv64xxx-i2c";

				#address-cells = <1>;

				#size-cells = <0>;

				interrupts = <31>;

				timeout-ms = <1000>;

				clocks = <&coreclk 0>;

			sata@a0000 {

				compatible = "marvell,orion-sata";

				reg = <0xa0000 0x5000>;

				interrupts = <55>;

				clocks = <&gateclk 15>, <&gateclk 30>;

				clock-names = "0", "1";

				status = "disabled";

			};



			i2c1: i2c@11100 {

				compatible = "marvell,mv64xxx-i2c";

			nand@d0000 {

				compatible = "marvell,armada370-nand";

				reg = <0xd0000 0x54>;

				#address-cells = <1>;

				#size-cells = <0>;

				interrupts = <32>;

				timeout-ms = <1000>;

				clocks = <&coreclk 0>;

				#size-cells = <1>;

				interrupts = <113>;

				clocks = <&coredivclk 0>;

				status = "disabled";

			};



			rtc@10300 {

				compatible = "marvell,orion-rtc";

				reg = <0x10300 0x20>;

				interrupts = <50>;

			};



			mvsdio@d4000 {

				compatible = "marvell,orion-sdio";

				reg = <0xd4000 0x200>;
@@ -220,52 +266,6 @@ 
				cap-mmc-highspeed;

				status = "disabled";

			};



			usb@50000 {

				compatible = "marvell,orion-ehci";

				reg = <0x50000 0x500>;

				interrupts = <45>;

				status = "disabled";

			};



			usb@51000 {

				compatible = "marvell,orion-ehci";

				reg = <0x51000 0x500>;

				interrupts = <46>;

				status = "disabled";

			};



			spi0: spi@10600 {

				compatible = "marvell,orion-spi";

				reg = <0x10600 0x28>;

				#address-cells = <1>;

				#size-cells = <0>;

				cell-index = <0>;

				interrupts = <30>;

				clocks = <&coreclk 0>;

				status = "disabled";

			};



			spi1: spi@10680 {

				compatible = "marvell,orion-spi";

				reg = <0x10680 0x28>;

				#address-cells = <1>;

				#size-cells = <0>;

				cell-index = <1>;

				interrupts = <92>;

				clocks = <&coreclk 0>;

				status = "disabled";

			};



			nand@d0000 {

				compatible = "marvell,armada370-nand";

				reg = <0xd0000 0x54>;

				#address-cells = <1>;

				#size-cells = <1>;

				interrupts = <113>;

				clocks = <&coredivclk 0>;

				status = "disabled";

			};

		};

	};

arch/arm/boot/dts/armada-370.dtsi

+37 −37
Original line number Diff line number Diff line
@@ -91,11 +91,6 @@ 
		};



		internal-regs {

			system-controller@18200 {

				compatible = "marvell,armada-370-xp-system-controller";

				reg = <0x18200 0x100>;

			};



			L2: l2-cache {

				compatible = "marvell,aurora-outer-cache";

				reg = <0x08000 0x1000>;
@@ -103,8 +98,17 @@ 
				wt-override;

			};



			interrupt-controller@20000 {

				reg = <0x20a00 0x1d0>, <0x21870 0x58>;

			i2c0: i2c@11000 {

				reg = <0x11000 0x20>;

			};



			i2c1: i2c@11100 {

				reg = <0x11100 0x20>;

			};



			system-controller@18200 {

				compatible = "marvell,armada-370-xp-system-controller";

				reg = <0x18200 0x100>;

			};



			pinctrl {
@@ -163,9 +167,11 @@ 
				interrupts = <91>;

			};



			timer@20300 {

				compatible = "marvell,armada-370-timer";

				clocks = <&coreclk 2>;

			gateclk: clock-gating-control@18220 {

				compatible = "marvell,armada-370-gating-clock";

				reg = <0x18220 0x4>;

				clocks = <&coreclk 0>;

				#clock-cells = <1>;

			};



			coreclk: mvebu-sar@18230 {
@@ -174,11 +180,28 @@ 
				#clock-cells = <1>;

			};



			gateclk: clock-gating-control@18220 {

				compatible = "marvell,armada-370-gating-clock";

				reg = <0x18220 0x4>;

			thermal@18300 {

				compatible = "marvell,armada370-thermal";

				reg = <0x18300 0x4

					0x18304 0x4>;

				status = "okay";

			};



			interrupt-controller@20000 {

				reg = <0x20a00 0x1d0>, <0x21870 0x58>;

			};



			timer@20300 {

				compatible = "marvell,armada-370-timer";

				clocks = <&coreclk 2>;

			};



			usb@50000 {

				clocks = <&coreclk 0>;

			};



			usb@51000 {

				clocks = <&coreclk 0>;

				#clock-cells = <1>;

			};



			xor@60800 {
@@ -218,29 +241,6 @@ 
					dmacap,memset;

				};

			};



			i2c0: i2c@11000 {

				reg = <0x11000 0x20>;

			};



			i2c1: i2c@11100 {

				reg = <0x11100 0x20>;

			};



			usb@50000 {

				clocks = <&coreclk 0>;

			};



			usb@51000 {

				clocks = <&coreclk 0>;

			};



			thermal@18300 {

				compatible = "marvell,armada370-thermal";

				reg = <0x18300 0x4

					0x18304 0x4>;

				status = "okay";

			};

		};

	};

};

arch/arm/boot/dts/armada-xp.dtsi

+50 −50
Original line number Diff line number Diff line
@@ -42,13 +42,14 @@ 
				wt-override;

			};



			interrupt-controller@20000 {

			      reg = <0x20a00 0x2d0>, <0x21070 0x58>;

			i2c0: i2c@11000 {

				compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c";

				reg = <0x11000 0x100>;

			};



			armada-370-xp-pmsu@22000 {

				compatible = "marvell,armada-370-xp-pmsu";

				reg = <0x22100 0x430>, <0x20800 0x20>;

			i2c1: i2c@11100 {

				compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c";

				reg = <0x11100 0x100>;

			};



			serial@12200 {
@@ -68,10 +69,16 @@ 
				status = "disabled";

			};



			timer@20300 {

				compatible = "marvell,armada-xp-timer";

				clocks = <&coreclk 2>, <&refclk>;

				clock-names = "nbclk", "fixed";

			system-controller@18200 {

				compatible = "marvell,armada-370-xp-system-controller";

				reg = <0x18200 0x500>;

			};



			gateclk: clock-gating-control@18220 {

				compatible = "marvell,armada-xp-gating-clock";

				reg = <0x18220 0x4>;

				clocks = <&coreclk 0>;

				#clock-cells = <1>;

			};



			coreclk: mvebu-sar@18230 {
@@ -80,6 +87,13 @@ 
				#clock-cells = <1>;

			};



			thermal@182b0 {

				compatible = "marvell,armadaxp-thermal";

				reg = <0x182b0 0x4

					0x184d0 0x4>;

				status = "okay";

			};



			cpuclk: clock-complex@18700 {

				#clock-cells = <1>;

				compatible = "marvell,armada-xp-cpu-clock";
@@ -87,16 +101,19 @@ 
				clocks = <&coreclk 1>;

			};



			gateclk: clock-gating-control@18220 {

				compatible = "marvell,armada-xp-gating-clock";

				reg = <0x18220 0x4>;

				clocks = <&coreclk 0>;

				#clock-cells = <1>;

			interrupt-controller@20000 {

			      reg = <0x20a00 0x2d0>, <0x21070 0x58>;

			};



			system-controller@18200 {

				compatible = "marvell,armada-370-xp-system-controller";

				reg = <0x18200 0x500>;

			timer@20300 {

				compatible = "marvell,armada-xp-timer";

				clocks = <&coreclk 2>, <&refclk>;

				clock-names = "nbclk", "fixed";

			};



			armada-370-xp-pmsu@22000 {

				compatible = "marvell,armada-370-xp-pmsu";

				reg = <0x22100 0x430>, <0x20800 0x20>;

			};



			eth2: ethernet@30000 {
@@ -107,6 +124,22 @@ 
				status = "disabled";

			};



			usb@50000 {

				clocks = <&gateclk 18>;

			};



			usb@51000 {

				clocks = <&gateclk 19>;

			};



			usb@52000 {

				compatible = "marvell,orion-ehci";

				reg = <0x52000 0x500>;

				interrupts = <47>;

				clocks = <&gateclk 20>;

				status = "disabled";

			};



			xor@60900 {

				compatible = "marvell,orion-xor";

				reg = <0x60900 0x100
@@ -146,39 +179,6 @@ 
					dmacap,memset;

				};

			};



			i2c0: i2c@11000 {

				compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c";

				reg = <0x11000 0x100>;

			};



			i2c1: i2c@11100 {

				compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c";

				reg = <0x11100 0x100>;

			};



			usb@50000 {

				clocks = <&gateclk 18>;

			};



			usb@51000 {

				clocks = <&gateclk 19>;

			};



			usb@52000 {

				compatible = "marvell,orion-ehci";

				reg = <0x52000 0x500>;

				interrupts = <47>;

				clocks = <&gateclk 20>;

				status = "disabled";

			};



			thermal@182b0 {

				compatible = "marvell,armadaxp-thermal";

				reg = <0x182b0 0x4

					0x184d0 0x4>;

				status = "okay";

			};

		};

	};