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

Commit 6226cf18 authored by Jason Cooper's avatar Jason Cooper
Browse files

ARM: orion5x: sort DT nodes by address 



Prevent future unnecessary merge conflicts

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

arch/arm/boot/dts/orion5x.dtsi

+53 −53
Original line number Original line Diff line number Diff line
@@ -42,6 +42,25 @@ 
			interrupts = <6>, <7>, <8>, <9>;

			interrupts = <6>, <7>, <8>, <9>;

		};

		};





		spi@10600 {

			compatible = "marvell,orion-spi";

			#address-cells = <1>;

			#size-cells = <0>;

			cell-index = <0>;

			reg = <0x10600 0x28>;

			status = "disabled";

		};



		i2c@11000 {

			compatible = "marvell,mv64xxx-i2c";

			reg = <0x11000 0x20>;

			#address-cells = <1>;

			#size-cells = <0>;

			interrupts = <5>;

			clock-frequency = <100000>;

			status = "disabled";

		};



		serial@12000 {

		serial@12000 {

			compatible = "ns16550a";

			compatible = "ns16550a";

			reg = <0x12000 0x100>;

			reg = <0x12000 0x100>;
@@ -60,15 +79,6 @@ 
			status = "disabled";

			status = "disabled";

		};

		};





		spi@10600 {

			compatible = "marvell,orion-spi";

			#address-cells = <1>;

			#size-cells = <0>;

			cell-index = <0>;

			reg = <0x10600 0x28>;

			status = "disabled";

		};



		wdt@20300 {

		wdt@20300 {

			compatible = "marvell,orion-wdt";

			compatible = "marvell,orion-wdt";

			reg = <0x20300 0x28>;

			reg = <0x20300 0x28>;
@@ -82,30 +92,6 @@ 
			status = "disabled";

			status = "disabled";

		};

		};





		ehci@a0000 {

			compatible = "marvell,orion-ehci";

			reg = <0xa0000 0x1000>;

			interrupts = <12>;

			status = "disabled";

		};



		sata@80000 {

			compatible = "marvell,orion-sata";

			reg = <0x80000 0x5000>;

			interrupts = <29>;

			status = "disabled";

		};



		i2c@11000 {

			compatible = "marvell,mv64xxx-i2c";

			reg = <0x11000 0x20>;

			#address-cells = <1>;

			#size-cells = <0>;

			interrupts = <5>;

			clock-frequency = <100000>;

			status = "disabled";

		};



		xor@60900 {

		xor@60900 {

			compatible = "marvell,orion-xor";

			compatible = "marvell,orion-xor";

			reg = <0x60900 0x100

			reg = <0x60900 0x100
@@ -125,26 +111,6 @@ 
			};

			};

		};

		};





		crypto@90000 {

			compatible = "marvell,orion-crypto";

			reg = <0x90000 0x10000>,

			      <0xf2200000 0x800>;

			reg-names = "regs", "sram";

			interrupts = <28>;

			status = "okay";

		};



		mdio: mdio-bus@72004 {

			compatible = "marvell,orion-mdio";

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0x72004 0x84>;

			interrupts = <22>;

			status = "disabled";



			/* add phy nodes in board file */

		};



		eth: ethernet-controller@72000 {

		eth: ethernet-controller@72000 {

			compatible = "marvell,orion-eth";

			compatible = "marvell,orion-eth";

			#address-cells = <1>;

			#address-cells = <1>;
@@ -162,5 +128,39 @@ 
				/* set phy-handle property in board file */

				/* set phy-handle property in board file */

			};

			};

		};

		};



		mdio: mdio-bus@72004 {

			compatible = "marvell,orion-mdio";

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0x72004 0x84>;

			interrupts = <22>;

			status = "disabled";



			/* add phy nodes in board file */

		};



		sata@80000 {

			compatible = "marvell,orion-sata";

			reg = <0x80000 0x5000>;

			interrupts = <29>;

			status = "disabled";

		};



		crypto@90000 {

			compatible = "marvell,orion-crypto";

			reg = <0x90000 0x10000>,

			      <0xf2200000 0x800>;

			reg-names = "regs", "sram";

			interrupts = <28>;

			status = "okay";

		};



		ehci@a0000 {

			compatible = "marvell,orion-ehci";

			reg = <0xa0000 0x1000>;

			interrupts = <12>;

			status = "disabled";

		};

	};

	};

};
 
};