[U-Boot] [PATCH v4 2/5] dts: cadence_spi: Sync DT bindings with Linux
Goldschmidt Simon
sgoldschmidt at de.pepperl-fuchs.com
Fri Nov 17 06:30:27 UTC 2017
> Jason Rush wrote:
> Adopt the Linux DT bindings and clean-up duplicate
> and unused values.
> ---
> Changes for v4:
> - Rebased
Reviewed-by: Simon Goldschmidt <sgoldschmidt at de.pepperl-fuchs.com>
>
> arch/arm/dts/keystone-k2g-evm.dts | 8 ++++----
> arch/arm/dts/keystone-k2g.dtsi | 5 +++--
> arch/arm/dts/socfpga.dtsi | 5 +++--
> arch/arm/dts/socfpga_arria10.dtsi | 4 ++--
> arch/arm/dts/socfpga_arria5_socdk.dts | 9 ++++-----
> arch/arm/dts/socfpga_cyclone5_is1.dts | 9 ++++-----
> arch/arm/dts/socfpga_cyclone5_socdk.dts | 9 ++++-----
> arch/arm/dts/socfpga_cyclone5_sockit.dts | 9 ++++-----
> arch/arm/dts/socfpga_cyclone5_socrates.dts | 9 ++++-----
> arch/arm/dts/socfpga_cyclone5_sr1500.dts | 9 ++++-----
> arch/arm/dts/socfpga_cyclone5_vining_fpga.dts | 18 ++++++++----------
> arch/arm/dts/stv0991.dts | 12 +++++++-----
> 12 files changed, 51 insertions(+), 55 deletions(-)
>
> diff --git a/arch/arm/dts/keystone-k2g-evm.dts b/arch/arm/dts/keystone-k2g-
> evm.dts
> index de208b3..ba566a4 100644
> --- a/arch/arm/dts/keystone-k2g-evm.dts
> +++ b/arch/arm/dts/keystone-k2g-evm.dts
> @@ -76,10 +76,10 @@
> spi-max-frequency = <96000000>;
> #address-cells = <1>;
> #size-cells = <1>;
> - tshsl-ns = <392>;
> - tsd2d-ns = <392>;
> - tchsh-ns = <100>;
> - tslch-ns = <100>;
> + cdns,tshsl-ns = <392>;
> + cdns,tsd2d-ns = <392>;
> + cdns,tchsh-ns = <100>;
> + cdns,tslch-ns = <100>;
> block-size = <18>;
>
>
> diff --git a/arch/arm/dts/keystone-k2g.dtsi b/arch/arm/dts/keystone-k2g.dtsi
> index 7b2fae6..9bcfea6 100644
> --- a/arch/arm/dts/keystone-k2g.dtsi
> +++ b/arch/arm/dts/keystone-k2g.dtsi
> @@ -92,8 +92,9 @@
> <0x24000000 0x4000000>;
> interrupts = <GIC_SPI 198 IRQ_TYPE_EDGE_RISING>;
> num-cs = <4>;
> - fifo-depth = <256>;
> - sram-size = <256>;
> + cdns,fifo-depth = <256>;
> + cdns,fifo-width = <4>;
> + cdns,trigger-address = <0x24000000>;
> status = "disabled";
> };
>
> diff --git a/arch/arm/dts/socfpga.dtsi b/arch/arm/dts/socfpga.dtsi
> index 8588221..7557aa0 100644
> --- a/arch/arm/dts/socfpga.dtsi
> +++ b/arch/arm/dts/socfpga.dtsi
> @@ -644,8 +644,9 @@
> clocks = <&qspi_clk>;
> ext-decoder = <0>; /* external decoder */
> num-cs = <4>;
> - fifo-depth = <128>;
> - sram-size = <128>;
> + cdns,fifo-depth = <128>;
> + cdns,fifo-width = <4>;
> + cdns,trigger-address = <0x00000000>;
> bus-num = <2>;
> status = "disabled";
> };
> diff --git a/arch/arm/dts/socfpga_arria10.dtsi b/arch/arm/dts/socfpga_arria10.dtsi
> index 377700d..abfd0bc 100644
> --- a/arch/arm/dts/socfpga_arria10.dtsi
> +++ b/arch/arm/dts/socfpga_arria10.dtsi
> @@ -734,8 +734,8 @@
> clocks = <&l4_main_clk>;
> ext-decoder = <0>; /* external decoder */
> num-chipselect = <4>;
> - fifo-depth = <128>;
> - sram-size = <512>;
> + cdns,fifo-depth = <128>;
> + cdns,fifo-width = <4>;
> bus-num = <2>;
> status = "disabled";
> };
> diff --git a/arch/arm/dts/socfpga_arria5_socdk.dts
> b/arch/arm/dts/socfpga_arria5_socdk.dts
> index 7265058..1e91a65 100644
> --- a/arch/arm/dts/socfpga_arria5_socdk.dts
> +++ b/arch/arm/dts/socfpga_arria5_socdk.dts
> @@ -94,10 +94,9 @@
> m25p,fast-read;
> page-size = <256>;
> block-size = <16>; /* 2^16, 64KB */
> - read-delay = <4>; /* delay value in read data capture register */
> - tshsl-ns = <50>;
> - tsd2d-ns = <50>;
> - tchsh-ns = <4>;
> - tslch-ns = <4>;
> + cdns,tshsl-ns = <50>;
> + cdns,tsd2d-ns = <50>;
> + cdns,tchsh-ns = <4>;
> + cdns,tslch-ns = <4>;
> };
> };
> diff --git a/arch/arm/dts/socfpga_cyclone5_is1.dts
> b/arch/arm/dts/socfpga_cyclone5_is1.dts
> index 16a3283..2e2b71f 100644
> --- a/arch/arm/dts/socfpga_cyclone5_is1.dts
> +++ b/arch/arm/dts/socfpga_cyclone5_is1.dts
> @@ -93,11 +93,10 @@
> m25p,fast-read;
> page-size = <256>;
> block-size = <16>; /* 2^16, 64KB */
> - read-delay = <4>; /* delay value in read data capture register */
> - tshsl-ns = <50>;
> - tsd2d-ns = <50>;
> - tchsh-ns = <4>;
> - tslch-ns = <4>;
> + cdns,tshsl-ns = <50>;
> + cdns,tsd2d-ns = <50>;
> + cdns,tchsh-ns = <4>;
> + cdns,tslch-ns = <4>;
> };
> };
>
> diff --git a/arch/arm/dts/socfpga_cyclone5_socdk.dts
> b/arch/arm/dts/socfpga_cyclone5_socdk.dts
> index f175ef2..95a8e65 100644
> --- a/arch/arm/dts/socfpga_cyclone5_socdk.dts
> +++ b/arch/arm/dts/socfpga_cyclone5_socdk.dts
> @@ -104,11 +104,10 @@
> m25p,fast-read;
> page-size = <256>;
> block-size = <16>; /* 2^16, 64KB */
> - read-delay = <4>; /* delay value in read data capture register */
> - tshsl-ns = <50>;
> - tsd2d-ns = <50>;
> - tchsh-ns = <4>;
> - tslch-ns = <4>;
> + cdns,tshsl-ns = <50>;
> + cdns,tsd2d-ns = <50>;
> + cdns,tchsh-ns = <4>;
> + cdns,tslch-ns = <4>;
> };
> };
>
> diff --git a/arch/arm/dts/socfpga_cyclone5_sockit.dts
> b/arch/arm/dts/socfpga_cyclone5_sockit.dts
> index e45c2ab..6f42b88 100644
> --- a/arch/arm/dts/socfpga_cyclone5_sockit.dts
> +++ b/arch/arm/dts/socfpga_cyclone5_sockit.dts
> @@ -84,11 +84,10 @@
> m25p,fast-read;
> page-size = <256>;
> block-size = <16>; /* 2^16, 64KB */
> - read-delay = <4>; /* delay value in read data capture register */
> - tshsl-ns = <50>;
> - tsd2d-ns = <50>;
> - tchsh-ns = <4>;
> - tslch-ns = <4>;
> + cdns,tshsl-ns = <50>;
> + cdns,tsd2d-ns = <50>;
> + cdns,tchsh-ns = <4>;
> + cdns,tslch-ns = <4>;
> };
> };
>
> diff --git a/arch/arm/dts/socfpga_cyclone5_socrates.dts
> b/arch/arm/dts/socfpga_cyclone5_socrates.dts
> index bdd9324..e3ae8a8 100644
> --- a/arch/arm/dts/socfpga_cyclone5_socrates.dts
> +++ b/arch/arm/dts/socfpga_cyclone5_socrates.dts
> @@ -74,11 +74,10 @@
> m25p,fast-read;
> page-size = <256>;
> block-size = <16>; /* 2^16, 64KB */
> - read-delay = <4>; /* delay value in read data capture register */
> - tshsl-ns = <50>;
> - tsd2d-ns = <50>;
> - tchsh-ns = <4>;
> - tslch-ns = <4>;
> + cdns,tshsl-ns = <50>;
> + cdns,tsd2d-ns = <50>;
> + cdns,tchsh-ns = <4>;
> + cdns,tslch-ns = <4>;
> };
> };
>
> diff --git a/arch/arm/dts/socfpga_cyclone5_sr1500.dts
> b/arch/arm/dts/socfpga_cyclone5_sr1500.dts
> index 739bbb7..e24830a 100644
> --- a/arch/arm/dts/socfpga_cyclone5_sr1500.dts
> +++ b/arch/arm/dts/socfpga_cyclone5_sr1500.dts
> @@ -92,10 +92,9 @@
> m25p,fast-read;
> page-size = <256>;
> block-size = <16>; /* 2^16, 64KB */
> - read-delay = <4>; /* delay value in read data capture register */
> - tshsl-ns = <50>;
> - tsd2d-ns = <50>;
> - tchsh-ns = <4>;
> - tslch-ns = <4>;
> + cdns,tshsl-ns = <50>;
> + cdns,tsd2d-ns = <50>;
> + cdns,tchsh-ns = <4>;
> + cdns,tslch-ns = <4>;
> };
> };
> diff --git a/arch/arm/dts/socfpga_cyclone5_vining_fpga.dts
> b/arch/arm/dts/socfpga_cyclone5_vining_fpga.dts
> index f168e4f..a0febe9 100644
> --- a/arch/arm/dts/socfpga_cyclone5_vining_fpga.dts
> +++ b/arch/arm/dts/socfpga_cyclone5_vining_fpga.dts
> @@ -79,11 +79,10 @@
> m25p,fast-read;
> page-size = <256>;
> block-size = <16>; /* 2^16, 64KB */
> - read-delay = <4>; /* delay value in read data capture register */
> - tshsl-ns = <50>;
> - tsd2d-ns = <50>;
> - tchsh-ns = <4>;
> - tslch-ns = <4>;
> + cdns,tshsl-ns = <50>;
> + cdns,tsd2d-ns = <50>;
> + cdns,tchsh-ns = <4>;
> + cdns,tslch-ns = <4>;
> };
>
> flash1: n25q00 at 1 {
> @@ -96,11 +95,10 @@
> m25p,fast-read;
> page-size = <256>;
> block-size = <16>; /* 2^16, 64KB */
> - read-delay = <4>; /* delay value in read data capture register */
> - tshsl-ns = <50>;
> - tsd2d-ns = <50>;
> - tchsh-ns = <4>;
> - tslch-ns = <4>;
> + cdns,tshsl-ns = <50>;
> + cdns,tsd2d-ns = <50>;
> + cdns,tchsh-ns = <4>;
> + cdns,tslch-ns = <4>;
> };
> };
>
> diff --git a/arch/arm/dts/stv0991.dts b/arch/arm/dts/stv0991.dts
> index fa3fd64..bceac09 100644
> --- a/arch/arm/dts/stv0991.dts
> +++ b/arch/arm/dts/stv0991.dts
> @@ -32,7 +32,9 @@
> reg = <0x80203000 0x100>,
> <0x40000000 0x1000000>;
> clocks = <3750000>;
> - sram-size = <256>;
> + cdns,fifo-depth = <256>;
> + cdns,fifo-width = <4>;
> + cdns,trigger-address = <0x40000000>;
> status = "okay";
>
> flash0: n25q32 at 0 {
> @@ -44,10 +46,10 @@
> m25p,fast-read;
> page-size = <256>;
> block-size = <16>; /* 2^16, 64KB */
> - tshsl-ns = <50>;
> - tsd2d-ns = <50>;
> - tchsh-ns = <4>;
> - tslch-ns = <4>;
> + cdns,tshsl-ns = <50>;
> + cdns,tsd2d-ns = <50>;
> + cdns,tchsh-ns = <4>;
> + cdns,tslch-ns = <4>;
> };
> };
> };
> --
> 2.1.4
More information about the U-Boot
mailing list