spi: Fix zynq SPI binding

Zynq is using Cadence IP where binding is documented in the Linux kernel
and there is no reason to use different binding.
Synchronize it.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/arch/arm/dts/zynq-7000.dtsi b/arch/arm/dts/zynq-7000.dtsi
index 7679cf242f916d19909c7866d9a89331af95fea5..d212b60ca6b264cea8e4cfb43a00c9d7684ad67c 100644 (file)
--- a/arch/arm/dts/zynq-7000.dtsi
+++ b/arch/arm/dts/zynq-7000.dtsi
@@ -166,7 +166,7 @@
                };
 
                spi0: spi@e0006000 {
-                       compatible = "xlnx,zynq-spi";
+                       compatible = "xlnx,zynq-spi-r1p6";
                        reg = <0xe0006000 0x1000>;
                        status = "disabled";
                        interrupt-parent = <&intc>;
@@ -179,7 +179,7 @@
                };
 
                spi1: spi@e0007000 {
-                       compatible = "xlnx,zynq-spi";
+                       compatible = "xlnx,zynq-spi-r1p6";
                        reg = <0xe0007000 0x1000>;
                        status = "disabled";
                        interrupt-parent = <&intc>;

diff --git a/doc/device-tree-bindings/spi/spi-zynq.txt b/doc/device-tree-bindings/spi/spi-zynq.txt
index f397a36d68016ea6120962de49ff7d9aece99bb6..cb2945789d05398694bfd2befacdd78bf5be6aaf 100644 (file)
--- a/doc/device-tree-bindings/spi/spi-zynq.txt
+++ b/doc/device-tree-bindings/spi/spi-zynq.txt
@@ -1,29 +1,32 @@
-Zynq SPI controller Device Tree Bindings
-----------------------------------------
+Cadence SPI controller Device Tree Bindings
+-------------------------------------------
 
 Required properties:
-- compatible           : Should be "xlnx,spi-zynq".
+- compatible           : Should be "cdns,spi-r1p6" or "xlnx,zynq-spi-r1p6".
 - reg                  : Physical base address and size of SPI registers map.
-- status               : Status will be disabled in dtsi and enabled in required dts.
-- interrupt-parent     : Must be core interrupt controller.
 - interrupts           : Property with a value describing the interrupt
                          number.
-- clocks               : Clock phandles (see clock bindings for details).
+- interrupt-parent     : Must be core interrupt controller
 - clock-names          : List of input clock names - "ref_clk", "pclk"
                          (See clock bindings for details).
+- clocks               : Clock phandles (see clock bindings for details).
 - spi-max-frequency    : Maximum SPI clocking speed of device in Hz
 
+Optional properties:
+- num-cs               : Number of chip selects used.
+                         If a decoder is used, this will be the number of
+                         chip selects after the decoder.
+- is-decoded-cs                : Flag to indicate whether decoder is used or not.
+
 Example:
 
-       spi@e0006000 {
-               compatible = "xlnx,zynq-spi";
-               reg = <0xe0006000 0x1000>;
-               status = "disabled";
-               interrupt-parent = <&intc>;
-               interrupts = <0 26 4>;
-               clocks = <&clkc 25>, <&clkc 34>;
+       spi@e0007000 {
+               compatible = "xlnx,zynq-spi-r1p6";
                clock-names = "ref_clk", "pclk";
-               spi-max-frequency = <166666700>;
-               #address-cells = <1>;
-               #size-cells = <0>;
+               clocks = <&clkc 26>, <&clkc 35>;
+               interrupt-parent = <&intc>;
+               interrupts = <0 49 4>;
+               num-cs = <4>;
+               is-decoded-cs = <0>;
+               reg = <0xe0007000 0x1000>;
        } ;

diff --git a/drivers/spi/zynq_spi.c b/drivers/spi/zynq_spi.c
index c5c3e1044fdace057384868e221405e4470d7005..0208afc4a636725922c1cbe9b5efdf8f9c7170ab 100644 (file)
--- a/drivers/spi/zynq_spi.c
+++ b/drivers/spi/zynq_spi.c
@@ -309,7 +309,7 @@ static const struct dm_spi_ops zynq_spi_ops = {
 };
 
 static const struct udevice_id zynq_spi_ids[] = {
-       { .compatible = "xlnx,zynq-spi" },
+       { .compatible = "xlnx,zynq-spi-r1p6" },
        { }
 };