Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / socfpga.dtsi

diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi
index d2ff3d5d83e76d04495bfcd4eca685754cd0aa8e..56fc214e6d2c3a6fd67f7ce41f11f0ec9a4c8abc 100644 (file)
--- a/arch/arm/boot/dts/socfpga.dtsi
+++ b/arch/arm/boot/dts/socfpga.dtsi
@@ -424,6 +424,7 @@
                                                compatible = "altr,socfpga-gate-clk";
                                                clocks = <&f2s_periph_ref_clk>, <&main_nand_sdmmc_clk>, <&per_nand_mmc_clk>;
                                                clk-gate = <0xa0 8>;
+                                               clk-phase = <0 135>;
                                        };
 
                                        nand_x_clk: nand_x_clk {
@@ -450,43 +451,28 @@
                                };
                        };
 
-               ethernet0: ethernet0 {
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       compatible = "altr,socfpga-stmmac";
-                       altr,sysmgr-syscon = <&sysmgr 0x60>;
+               gmac0: ethernet@ff700000 {
+                       compatible = "altr,socfpga-stmmac", "snps,dwmac-3.70a", "snps,dwmac";
+                       altr,sysmgr-syscon = <&sysmgr 0x60 0>;
+                       reg = <0xff700000 0x2000>;
+                       interrupts = <0 115 4>;
+                       interrupt-names = "macirq";
+                       mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */
+                       clocks = <&emac0_clk>;
+                       clock-names = "stmmaceth";
                        status = "disabled";
-                       ranges;
-
-                       gmac0: gmac0@ff700000 {
-                               compatible = "snps,dwmac-3.70a", "snps,dwmac";
-                               reg = <0xff700000 0x2000>;
-                               interrupts = <0 115 4>;
-                               interrupt-names = "macirq";
-                               mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */
-                               clocks = <&emac0_clk>;
-                               clock-names = "stmmaceth";
-                       };
                };
 
-               ethernet1: ethernet1 {
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       compatible = "altr,socfpga-stmmac";
-                       altr,sysmgr-syscon = <&sysmgr 0x60>;
+               gmac1: ethernet@ff702000 {
+                       compatible = "altr,socfpga-stmmac", "snps,dwmac-3.70a", "snps,dwmac";
+                       altr,sysmgr-syscon = <&sysmgr 0x60 2>;
+                       reg = <0xff702000 0x2000>;
+                       interrupts = <0 120 4>;
+                       interrupt-names = "macirq";
+                       mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */
+                       clocks = <&emac1_clk>;
+                       clock-names = "stmmaceth";
                        status = "disabled";
-                       ranges;
-
-                       gmac1: gmac1@ff702000 {
-                               device_type = "network";
-                               compatible = "snps,dwmac-3.70a", "snps,dwmac";
-                               reg = <0xff702000 0x2000>;
-                               interrupts = <0 120 4>;
-                               interrupt-names = "macirq";
-                               mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */
-                               clocks = <&emac1_clk>;
-                               clock-names = "stmmaceth";
-                       };
                };
 
                L2: l2-cache@fffef000 {
@@ -563,7 +549,7 @@
                        reg = <0xffd05000 0x1000>;
                };
 
-               sysmgr@ffd08000 {
+               sysmgr: sysmgr@ffd08000 {
                        compatible = "altr,sys-mgr", "syscon";
                        reg = <0xffd08000 0x4000>;
                };