[U-Boot] [PATCH 06/19] spi: Fix zynq SPI binding

[Jagan Teki]

On 22 July 2015 at 21:08, Michal Simek <michal.simek at xilinx.com> wrote:
> 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 at xilinx.com>

Reviewed-by: Jagan Teki <jteki at openedev.com>

Updated patchwork, just take along with the series.

> ---
>
>  arch/arm/dts/zynq-7000.dtsi               |  4 ++--
>  doc/device-tree-bindings/spi/spi-zynq.txt | 35 +++++++++++++++++--------------
>  drivers/spi/zynq_spi.c                    |  2 +-
>  3 files changed, 22 insertions(+), 19 deletions(-)
>
> diff --git a/arch/arm/dts/zynq-7000.dtsi b/arch/arm/dts/zynq-7000.dtsi
> index 7679cf242f91..d212b60ca6b2 100644
> --- a/arch/arm/dts/zynq-7000.dtsi
> +++ b/arch/arm/dts/zynq-7000.dtsi
> @@ -166,7 +166,7 @@
>                 };
>
>                 spi0: spi at e0006000 {
> -                       compatible = "xlnx,zynq-spi";
> +                       compatible = "xlnx,zynq-spi-r1p6";
>                         reg = <0xe0006000 0x1000>;
>                         status = "disabled";
>                         interrupt-parent = <&intc>;
> @@ -179,7 +179,7 @@
>                 };
>
>                 spi1: spi at 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 f397a36d6801..cb2945789d05 100644
> --- 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 at e0006000 {
> -               compatible = "xlnx,zynq-spi";
> -               reg = <0xe0006000 0x1000>;
> -               status = "disabled";
> -               interrupt-parent = <&intc>;
> -               interrupts = <0 26 4>;
> -               clocks = <&clkc 25>, <&clkc 34>;
> +       spi at 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 c5c3e1044fda..0208afc4a636 100644
> --- 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" },
>         { }
>  };
>
> --
> 2.3.5

thanks!
-- 
Jagan | openedev.