Merge branch 'master' of http://git.denx.de/u-boot-sunxi

[oweals/u-boot.git] / arch / arm / dts / socfpga.dtsi

diff --git a/arch/arm/dts/socfpga.dtsi b/arch/arm/dts/socfpga.dtsi
index 969e5ad751cbcb02049fd02d6fa0c54d56a8204b..8588221e572f83a9f68fb668cb123902846b3bb9 100644 (file)
--- a/arch/arm/dts/socfpga.dtsi
+++ b/arch/arm/dts/socfpga.dtsi
@@ -20,6 +20,9 @@
                timer1 = &timer1;
                timer2 = &timer2;
                timer3 = &timer3;
+               spi0 = &qspi;
+               spi1 = &spi0;
+               spi2 = &spi1;
        };
 
        cpus {
@@ -546,6 +549,7 @@
 
                        porta: gpio-controller@0 {
                                compatible = "snps,dw-apb-gpio-port";
+                               bank-name = "porta";
                                gpio-controller;
                                #gpio-cells = <2>;
                                snps,nr-gpios = <29>;
@@ -566,6 +570,7 @@
 
                        portb: gpio-controller@0 {
                                compatible = "snps,dw-apb-gpio-port";
+                               bank-name = "portb";
                                gpio-controller;
                                #gpio-cells = <2>;
                                snps,nr-gpios = <29>;
@@ -586,6 +591,7 @@
 
                        portc: gpio-controller@0 {
                                compatible = "snps,dw-apb-gpio-port";
+                               bank-name = "portc";
                                gpio-controller;
                                #gpio-cells = <2>;
                                snps,nr-gpios = <27>;
@@ -617,7 +623,7 @@
                        arm,data-latency = <2 1 1>;
                };
 
-               mmc: dwmmc0@ff704000 {
+               mmc0: dwmmc0@ff704000 {
                        compatible = "altr,socfpga-dw-mshc";
                        reg = <0xff704000 0x1000>;
                        interrupts = <0 139 4>;
@@ -637,19 +643,20 @@
                        interrupts = <0 151 4>;
                        clocks = <&qspi_clk>;
                        ext-decoder = <0>;  /* external decoder */
-                       num-chipselect = <4>;
+                       num-cs = <4>;
                        fifo-depth = <128>;
+                       sram-size = <128>;
                        bus-num = <2>;
                        status = "disabled";
                };
 
                spi0: spi@fff00000 {
-                       compatible = "snps,dw-spi-mmio";
+                       compatible = "snps,dw-apb-ssi";
                        #address-cells = <1>;
                        #size-cells = <0>;
                        reg = <0xfff00000 0x1000>;
                        interrupts = <0 154 4>;
-                       num-chipselect = <4>;
+                       num-cs = <4>;
                        bus-num = <0>;
                        tx-dma-channel = <&pdma 16>;
                        rx-dma-channel = <&pdma 17>;
@@ -658,12 +665,12 @@
                };
 
                spi1: spi@fff01000 {
-                       compatible = "snps,dw-spi-mmio";
+                       compatible = "snps,dw-apb-ssi";
                        #address-cells = <1>;
                        #size-cells = <0>;
                        reg = <0xfff01000 0x1000>;
                        interrupts = <0 156 4>;
-                       num-chipselect = <4>;
+                       num-cs = <4>;
                        bus-num = <1>;
                        tx-dma-channel = <&pdma 20>;
                        rx-dma-channel = <&pdma 21>;