ARM: zynq: dt: Use spi nodes from dtsi

Sync with mainline.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Soren Brinkmann <soren.brinkmann@xilinx.com>

diff --git a/arch/arm/boot/dts/zynq-zc770-xm010.dts b/arch/arm/boot/dts/zynq-zc770-xm010.dts
index 954a408e276ff0cb7c67ff01437af803836843d6..a7cffa10f103cdba9bfb203ca4ae99f2c1ff740a 100644 (file)
--- a/arch/arm/boot/dts/zynq-zc770-xm010.dts
+++ b/arch/arm/boot/dts/zynq-zc770-xm010.dts
@@ -22,7 +22,7 @@
                ethernet0 = &gem0;
                i2c0 = &i2c0;
                serial0 = &uart1;
-               spi0 = &ps7_spi_1;
+               spi0 = &spi1;
                spi1 = &ps7_qspi_0;
        };
 
@@ -81,30 +81,23 @@
                        };
 
                } ;
-               ps7_spi_1: ps7-spi@e0007000 {
-                       clock-names = "ref_clk", "pclk";
-                       clocks = <&clkc 26>, <&clkc 35>;
-                       compatible = "cdns,spi-r1p6";
-                       interrupt-parent = <&intc>;
-                       interrupts = <0 49 4>;
-                       num-cs = <4>;
-                       is-decoded-cs = <0>;
-                       reg = <0xe0007000 0x1000>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       flash@0 {
-                               compatible = "sst25wf080";
-                               reg = <1>;
-                               spi-max-frequency = <1000000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               partition@test {
-                                       label = "spi-flash";
-                                       reg = <0x0 0x100000>;
-                               };
-                       };
+       };
+};
 
-               } ;
+&spi1 {
+       status = "okay";
+       num-cs = <4>;
+       is-decoded-cs = <0>;
+       flash@0 {
+               compatible = "sst25wf080";
+               reg = <1>;
+               spi-max-frequency = <1000000>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+               partition@test {
+                       label = "spi-flash";
+                       reg = <0x0 0x100000>;
+               };
        };
 };
 

diff --git a/arch/arm/boot/dts/zynq-zc770-xm011.dts b/arch/arm/boot/dts/zynq-zc770-xm011.dts
index 66d9fa1b0b160eb18ee77b7cc9b7bcb41157ba4e..dd5646b7acf01cf8c1610d94d9db74989635d974 100644 (file)
--- a/arch/arm/boot/dts/zynq-zc770-xm011.dts
+++ b/arch/arm/boot/dts/zynq-zc770-xm011.dts
@@ -21,7 +21,7 @@
        aliases {
                i2c0 = &i2c1;
                serial0 = &uart1;
-               spi0 = &ps7_spi_0;
+               spi0 = &spi0;
        };
 
        chosen {
@@ -87,19 +87,15 @@
 
                        } ;
                } ;
-               ps7_spi_0: ps7-spi@e0006000 {
-                       clock-names = "ref_clk", "pclk";
-                       clocks = <&clkc 25>, <&clkc 34>;
-                       compatible = "cdns,spi-r1p6";
-                       interrupt-parent = <&intc>;
-                       interrupts = <0 26 4>;
-                       num-cs = <4>;
-                       is-decoded-cs = <0>;
-                       reg = <0xe0006000 0x1000>;
-               } ;
        };
 };
 
+&spi0 {
+       status = "okay";
+       num-cs = <4>;
+       is-decoded-cs = <0>;
+};
+
 &usb1 {
        status = "okay";
        dr_mode = "host";

diff --git a/arch/arm/boot/dts/zynq-zc770-xm012.dts b/arch/arm/boot/dts/zynq-zc770-xm012.dts
index 483f3ea1c1b868c8946bbeac3f7914a71bd760c1..db0165c1e573f2d2dc54cd4043ba98473004047c 100644 (file)
--- a/arch/arm/boot/dts/zynq-zc770-xm012.dts
+++ b/arch/arm/boot/dts/zynq-zc770-xm012.dts
@@ -22,7 +22,7 @@
                i2c0 = &i2c0;
                i2c1 = &i2c1;
                serial0 = &uart1;
-               spi0 = &ps7_spi_1;
+               spi0 = &spi1;
        };
 
        chosen {
@@ -87,19 +87,15 @@
                                };
                        } ;
                } ;
-               ps7_spi_1: ps7-spi@e0007000 {
-                       clock-names = "ref_clk", "pclk";
-                       clocks = <&clkc 26>, <&clkc 35>;
-                       compatible = "cdns,spi-r1p6";
-                       interrupt-parent = <&intc>;
-                       interrupts = <0 49 4>;
-                       num-cs = <4>;
-                       is-decoded-cs = <0>;
-                       reg = <0xe0007000 0x1000>;
-               } ;
        };
 };
 
+&spi1 {
+       status = "okay";
+       num-cs = <4>;
+       is-decoded-cs = <0>;
+};
+
 &can1 {
        status = "okay";
 };

diff --git a/arch/arm/boot/dts/zynq-zc770-xm013.dts b/arch/arm/boot/dts/zynq-zc770-xm013.dts
index edd3e0941271c221fb5416d7f2cecc5391326015..3ee298fb0bf2242e34dcca595e1d11d59b99feba 100644 (file)
--- a/arch/arm/boot/dts/zynq-zc770-xm013.dts
+++ b/arch/arm/boot/dts/zynq-zc770-xm013.dts
@@ -22,7 +22,7 @@
                ethernet0 = &gem1;
                i2c0 = &i2c1;
                serial0 = &uart0;
-               spi0 = &ps7_spi_0;
+               spi0 = &spi0;
                spi1 = &ps7_qspi_0;
        };
 
@@ -81,27 +81,21 @@
                        };
 
                } ;
-               ps7_spi_0: ps7-spi@e0006000 {
-                       clock-names = "ref_clk", "pclk";
-                       clocks = <&clkc 25>, <&clkc 34>;
-                       compatible = "cdns,spi-r1p6";
-                       interrupt-parent = <&intc>;
-                       interrupts = <0 26 4>;
-                       num-cs = <4>;
-                       is-decoded-cs = <0>;
-                       reg = <0xe0006000 0x1000>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       eeprom: at25@0 {
-                               at25,byte-len = <8192>;
-                               at25,addr-mode = <2>;
-                               at25,page-size = <32>;
+       };
+};
 
-                               compatible = "atmel,at25";
-                               reg = <2>;
-                               spi-max-frequency = <1000000>;
-                       };
-               } ;
+&spi0 {
+       status = "okay";
+       num-cs = <4>;
+       is-decoded-cs = <0>;
+       eeprom: at25@0 {
+               at25,byte-len = <8192>;
+               at25,addr-mode = <2>;
+               at25,page-size = <32>;
+
+               compatible = "atmel,at25";
+               reg = <2>;
+               spi-max-frequency = <1000000>;
        };
 };