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 537f1a5c07f55538ca161a16f8d0594b6170ca62..56fc214e6d2c3a6fd67f7ce41f11f0ec9a4c8abc 100644 (file)
--- a/arch/arm/boot/dts/socfpga.dtsi
+++ b/arch/arm/boot/dts/socfpga.dtsi
@@ -92,7 +92,12 @@
                                        #address-cells = <1>;
                                        #size-cells = <0>;
 
-                                       osc: osc1 {
+                                       osc1: osc1 {
+                                               #clock-cells = <0>;
+                                               compatible = "fixed-clock";
+                                       };
+
+                                       osc2: osc2 {
                                                #clock-cells = <0>;
                                                compatible = "fixed-clock";
                                        };
@@ -100,7 +105,11 @@
                                        f2s_periph_ref_clk: f2s_periph_ref_clk {
                                                #clock-cells = <0>;
                                                compatible = "fixed-clock";
-                                               clock-frequency = <10000000>;
+                                       };
+
+                                       f2s_sdram_ref_clk: f2s_sdram_ref_clk {
+                                               #clock-cells = <0>;
+                                               compatible = "fixed-clock";
                                        };
 
                                        main_pll: main_pll {
@@ -108,7 +117,7 @@
                                                #size-cells = <0>;
                                                #clock-cells = <0>;
                                                compatible = "altr,socfpga-pll-clock";
-                                               clocks = <&osc>;
+                                               clocks = <&osc1>;
                                                reg = <0x40>;
 
                                                mpuclk: mpuclk {
@@ -162,7 +171,7 @@
                                                #size-cells = <0>;
                                                #clock-cells = <0>;
                                                compatible = "altr,socfpga-pll-clock";
-                                               clocks = <&osc>;
+                                               clocks = <&osc1>, <&osc2>, <&f2s_periph_ref_clk>;
                                                reg = <0x80>;
 
                                                emac0_clk: emac0_clk {
@@ -213,7 +222,7 @@
                                                #size-cells = <0>;
                                                #clock-cells = <0>;
                                                compatible = "altr,socfpga-pll-clock";
-                                               clocks = <&osc>;
+                                               clocks = <&osc1>, <&osc2>, <&f2s_sdram_ref_clk>;
                                                reg = <0xC0>;
 
                                                ddr_dqs_clk: ddr_dqs_clk {
@@ -415,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 {
@@ -443,6 +453,7 @@
 
                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";
@@ -454,6 +465,7 @@
 
                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";
@@ -473,6 +485,17 @@
                        arm,data-latency = <2 1 1>;
                };
 
+               mmc: dwmmc0@ff704000 {
+                       compatible = "altr,socfpga-dw-mshc";
+                       reg = <0xff704000 0x1000>;
+                       interrupts = <0 139 4>;
+                       fifo-depth = <0x400>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       clocks = <&l4_mp_clk>, <&sdmmc_clk>;
+                       clock-names = "biu", "ciu";
+               };
+
                /* Local timer */
                timer@fffec600 {
                        compatible = "arm,cortex-a9-twd-timer";
@@ -526,9 +549,9 @@
                        reg = <0xffd05000 0x1000>;
                };
 
-               sysmgr@ffd08000 {
-                               compatible = "altr,sys-mgr";
-                               reg = <0xffd08000 0x4000>;
-                       };
+               sysmgr: sysmgr@ffd08000 {
+                       compatible = "altr,sys-mgr", "syscon";
+                       reg = <0xffd08000 0x4000>;
+               };
        };
 };