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

Commit 64aa1fe1 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'socfpga_for_v4.4_cleanup' of... 

Merge tag 'socfpga_for_v4.4_cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into next/dt

SoCFPGA dts cleanup for v4.4
- Re-order DTS nodes into correct alphabetical order

* tag 'socfpga_for_v4.4_cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux

:
  ARM: socfpga: dts: sort nodes alphabetically

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 91744554 0cdbec62

arch/arm/boot/dts/socfpga.dtsi

+64 −64
Original line number Diff line number Diff line
@@ -556,46 +556,6 @@ 
			status = "disabled";

		};



		i2c0: i2c@ffc04000 {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "snps,designware-i2c";

			reg = <0xffc04000 0x1000>;

			clocks = <&l4_sp_clk>;

			interrupts = <0 158 0x4>;

			status = "disabled";

		};



		i2c1: i2c@ffc05000 {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "snps,designware-i2c";

			reg = <0xffc05000 0x1000>;

			clocks = <&l4_sp_clk>;

			interrupts = <0 159 0x4>;

			status = "disabled";

		};



		i2c2: i2c@ffc06000 {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "snps,designware-i2c";

			reg = <0xffc06000 0x1000>;

			clocks = <&l4_sp_clk>;

			interrupts = <0 160 0x4>;

			status = "disabled";

		};



		i2c3: i2c@ffc07000 {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "snps,designware-i2c";

			reg = <0xffc07000 0x1000>;

			clocks = <&l4_sp_clk>;

			interrupts = <0 161 0x4>;

			status = "disabled";

		};



		gpio0: gpio@ff708000 {

			#address-cells = <1>;

			#size-cells = <0>;
@@ -656,15 +616,44 @@ 
			};

		};



		sdr: sdr@ffc25000 {

			compatible = "syscon";

			reg = <0xffc25000 0x1000>;

		i2c0: i2c@ffc04000 {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "snps,designware-i2c";

			reg = <0xffc04000 0x1000>;

			clocks = <&l4_sp_clk>;

			interrupts = <0 158 0x4>;

			status = "disabled";

		};



		sdramedac {

			compatible = "altr,sdram-edac";

			altr,sdr-syscon = <&sdr>;

			interrupts = <0 39 4>;

		i2c1: i2c@ffc05000 {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "snps,designware-i2c";

			reg = <0xffc05000 0x1000>;

			clocks = <&l4_sp_clk>;

			interrupts = <0 159 0x4>;

			status = "disabled";

		};



		i2c2: i2c@ffc06000 {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "snps,designware-i2c";

			reg = <0xffc06000 0x1000>;

			clocks = <&l4_sp_clk>;

			interrupts = <0 160 0x4>;

			status = "disabled";

		};



		i2c3: i2c@ffc07000 {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "snps,designware-i2c";

			reg = <0xffc07000 0x1000>;

			clocks = <&l4_sp_clk>;

			interrupts = <0 161 0x4>;

			status = "disabled";

		};



		L2: l2-cache@fffef000 {
@@ -695,6 +684,29 @@ 
			reg = <0xffff0000 0x10000>;

		};



		rst: rstmgr@ffd05000 {

			#reset-cells = <1>;

			compatible = "altr,rst-mgr";

			reg = <0xffd05000 0x1000>;

			altr,modrst-offset = <0x10>;

		};



		scu: snoop-control-unit@fffec000 {

			compatible = "arm,cortex-a9-scu";

			reg = <0xfffec000 0x100>;

		};



		sdr: sdr@ffc25000 {

			compatible = "syscon";

			reg = <0xffc25000 0x1000>;

		};



		sdramedac {

			compatible = "altr,sdram-edac";

			altr,sdr-syscon = <&sdr>;

			interrupts = <0 39 4>;

		};



		spi0: spi@fff00000 {

			compatible = "snps,dw-apb-ssi";

			#address-cells = <1>;
@@ -706,11 +718,6 @@ 
			status = "disabled";

		};



		scu: snoop-control-unit@fffec000 {

			compatible = "arm,cortex-a9-scu";

			reg = <0xfffec000 0x100>;

		};



		spi1: spi@fff01000 {

			compatible = "snps,dw-apb-ssi";

			#address-cells = <1>;
@@ -722,6 +729,11 @@ 
			status = "disabled";

		};



		sysmgr: sysmgr@ffd08000 {

			compatible = "altr,sys-mgr", "syscon";

			reg = <0xffd08000 0x4000>;

		};



		/* Local timer */

		timer@fffec600 {

			compatible = "arm,cortex-a9-twd-timer";
@@ -786,13 +798,6 @@ 
			dma-names = "tx", "rx";

		};



		rst: rstmgr@ffd05000 {

			#reset-cells = <1>;

			compatible = "altr,rst-mgr";

			reg = <0xffd05000 0x1000>;

			altr,modrst-offset = <0x10>;

		};



		usbphy0: usbphy@0 {

			#phy-cells = <0>;

			compatible = "usb-nop-xceiv";
@@ -836,10 +841,5 @@ 
			clocks = <&osc1>;

			status = "disabled";

		};



		sysmgr: sysmgr@ffd08000 {

			compatible = "altr,sys-mgr", "syscon";

			reg = <0xffd08000 0x4000>;

		};

	};

};