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

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
...@@ -556,46 +556,6 @@ gmac1: ethernet@ff702000 { ...@@ -556,46 +556,6 @@ gmac1: ethernet@ff702000 {
status = "disabled"; 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 { gpio0: gpio@ff708000 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -656,15 +616,44 @@ portc: gpio-controller@0 { ...@@ -656,15 +616,44 @@ portc: gpio-controller@0 {
}; };
}; };
sdr: sdr@ffc25000 { i2c0: i2c@ffc04000 {
compatible = "syscon"; #address-cells = <1>;
reg = <0xffc25000 0x1000>; #size-cells = <0>;
compatible = "snps,designware-i2c";
reg = <0xffc04000 0x1000>;
clocks = <&l4_sp_clk>;
interrupts = <0 158 0x4>;
status = "disabled";
}; };
sdramedac { i2c1: i2c@ffc05000 {
compatible = "altr,sdram-edac"; #address-cells = <1>;
altr,sdr-syscon = <&sdr>; #size-cells = <0>;
interrupts = <0 39 4>; 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 { L2: l2-cache@fffef000 {
...@@ -695,6 +684,29 @@ ocram: sram@ffff0000 { ...@@ -695,6 +684,29 @@ ocram: sram@ffff0000 {
reg = <0xffff0000 0x10000>; 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 { spi0: spi@fff00000 {
compatible = "snps,dw-apb-ssi"; compatible = "snps,dw-apb-ssi";
#address-cells = <1>; #address-cells = <1>;
...@@ -706,11 +718,6 @@ spi0: spi@fff00000 { ...@@ -706,11 +718,6 @@ spi0: spi@fff00000 {
status = "disabled"; status = "disabled";
}; };
scu: snoop-control-unit@fffec000 {
compatible = "arm,cortex-a9-scu";
reg = <0xfffec000 0x100>;
};
spi1: spi@fff01000 { spi1: spi@fff01000 {
compatible = "snps,dw-apb-ssi"; compatible = "snps,dw-apb-ssi";
#address-cells = <1>; #address-cells = <1>;
...@@ -722,6 +729,11 @@ spi1: spi@fff01000 { ...@@ -722,6 +729,11 @@ spi1: spi@fff01000 {
status = "disabled"; status = "disabled";
}; };
sysmgr: sysmgr@ffd08000 {
compatible = "altr,sys-mgr", "syscon";
reg = <0xffd08000 0x4000>;
};
/* Local timer */ /* Local timer */
timer@fffec600 { timer@fffec600 {
compatible = "arm,cortex-a9-twd-timer"; compatible = "arm,cortex-a9-twd-timer";
...@@ -786,13 +798,6 @@ uart1: serial1@ffc03000 { ...@@ -786,13 +798,6 @@ uart1: serial1@ffc03000 {
dma-names = "tx", "rx"; dma-names = "tx", "rx";
}; };
rst: rstmgr@ffd05000 {
#reset-cells = <1>;
compatible = "altr,rst-mgr";
reg = <0xffd05000 0x1000>;
altr,modrst-offset = <0x10>;
};
usbphy0: usbphy@0 { usbphy0: usbphy@0 {
#phy-cells = <0>; #phy-cells = <0>;
compatible = "usb-nop-xceiv"; compatible = "usb-nop-xceiv";
...@@ -836,10 +841,5 @@ watchdog1: watchdog@ffd03000 { ...@@ -836,10 +841,5 @@ watchdog1: watchdog@ffd03000 {
clocks = <&osc1>; clocks = <&osc1>;
status = "disabled"; status = "disabled";
}; };
sysmgr: sysmgr@ffd08000 {
compatible = "altr,sys-mgr", "syscon";
reg = <0xffd08000 0x4000>;
};
}; };
}; };
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment