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

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

diff --git a/arch/arm/dts/socfpga.dtsi b/arch/arm/dts/socfpga.dtsi
index 969e5ad751cbcb02049fd02d6fa0c54d56a8204b..bf791c5ddef3c4c6db942d8808ae818cb975707d 100644 (file)
--- a/arch/arm/dts/socfpga.dtsi
+++ b/arch/arm/dts/socfpga.dtsi
@@ -637,19 +637,19 @@
                        interrupts = <0 151 4>;
                        clocks = <&qspi_clk>;
                        ext-decoder = <0>;  /* external decoder */
-                       num-chipselect = <4>;
+                       num-cs = <4>;
                        fifo-depth = <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 +658,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>;