[PATCH] xilinx: Add jedec compatible string for QSPI (Zynq/ZynqMP)

[Michal Simek]

pá 6. 8. 2021 v 13:28 odesílatel Michal Simek <michal.simek at xilinx.com> napsal:
>
> From: Raju Kumar Pothuraju <raju.kumar-pothuraju at xilinx.com>
>
> Add missing "jedec, spi-nor" compatible string for QSPI flash node.
> Spi-nor framework uses this compatibility string to probe &
> initialize flash. With missing compatibility string we are observing
> below error:
>
> Zynq> sf probe 0 0 0
>  jedec_spi_nor spi_flash at 0:0: unrecognized JEDEC id bytes:
> 00, 00, 00  Failed to initialize SPI flash at 0:0 (error -2)
>
> Signed-off-by: Raju Kumar Pothuraju <raju.kumar-pothuraju at xilinx.com>
> Signed-off-by: Michal Simek <michal.simek at xilinx.com>
> ---
>
>  arch/arm/dts/zynq-cc108.dts                           | 2 +-
>  arch/arm/dts/zynq-cse-qspi.dtsi                       | 2 +-
>  arch/arm/dts/zynq-topic-miami.dts                     | 2 +-
>  arch/arm/dts/zynqmp-topic-miamimp-xilinx-xdp-v1r1.dts | 2 +-
>  4 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/dts/zynq-cc108.dts b/arch/arm/dts/zynq-cc108.dts
> index 64d73ecbc592..036106e2212c 100644
> --- a/arch/arm/dts/zynq-cc108.dts
> +++ b/arch/arm/dts/zynq-cc108.dts
> @@ -58,7 +58,7 @@
>         is-dual = <0>;
>         num-cs = <1>;
>         flash at 0 { /* 16 MB */
> -               compatible = "n25q128a11";
> +               compatible = "n25q128a11", "jedec,spi-nor";
>                 reg = <0x0>;
>                 spi-max-frequency = <50000000>;
>                 spi-tx-bus-width = <1>;
> diff --git a/arch/arm/dts/zynq-cse-qspi.dtsi b/arch/arm/dts/zynq-cse-qspi.dtsi
> index eb0e29e6cb6e..38410eeca886 100644
> --- a/arch/arm/dts/zynq-cse-qspi.dtsi
> +++ b/arch/arm/dts/zynq-cse-qspi.dtsi
> @@ -60,7 +60,7 @@
>                         #size-cells = <0>;
>                         num-cs = <1>;
>                         flash0: flash at 0 {
> -                               compatible = "n25q128a11";
> +                               compatible = "n25q128a11", "jedec,spi-nor";
>                                 reg = <0x0>;
>                                 spi-tx-bus-width = <1>;
>                                 spi-rx-bus-width = <4>;
> diff --git a/arch/arm/dts/zynq-topic-miami.dts b/arch/arm/dts/zynq-topic-miami.dts
> index ab6bde95fed9..c4ec56138e1e 100644
> --- a/arch/arm/dts/zynq-topic-miami.dts
> +++ b/arch/arm/dts/zynq-topic-miami.dts
> @@ -36,7 +36,7 @@
>         is-dual = <0>;
>         num-cs = <1>;
>         flash at 0 {
> -               compatible = "st,m25p80", "n25q256a";
> +               compatible = "st,m25p80", "n25q256a", "jedec,spi-nor";
>                 m25p,fast-read;
>                 reg = <0x0>;
>                 spi-tx-bus-width = <1>;
> diff --git a/arch/arm/dts/zynqmp-topic-miamimp-xilinx-xdp-v1r1.dts b/arch/arm/dts/zynqmp-topic-miamimp-xilinx-xdp-v1r1.dts
> index 6ec96e0e8c96..300e2ebe96e8 100644
> --- a/arch/arm/dts/zynqmp-topic-miamimp-xilinx-xdp-v1r1.dts
> +++ b/arch/arm/dts/zynqmp-topic-miamimp-xilinx-xdp-v1r1.dts
> @@ -58,7 +58,7 @@
>         status = "okay";
>         is-dual = <1>;
>         flash at 0 {
> -               compatible = "st,m25p80", "n25q256a";
> +               compatible = "st,m25p80", "n25q256a", "jedec,spi-nor";
>                 m25p,fast-read;
>                 reg = <0x0>;
>                 spi-tx-bus-width = <1>;
> --
> 2.32.0
>

Applied.
M

-- 
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs