lkml.org 
[lkml]   [2021]   [Oct]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 076/151] ARM: dts: imx: change the spi-nor tx
    Date
    From: Haibo Chen <haibo.chen@nxp.com>

    [ Upstream commit b2a4f4a302b83976ad0d2930abe0f38e6119a144 ]

    Before commit 0e30f47232ab5 ("mtd: spi-nor: add support for DTR protocol"),
    for all PP command, it only support 1-1-1 mode, no matter the tx setting
    in dts. But after the upper commit, the logic change. It will choose
    the best mode(fastest mode) which flash device and spi-nor host controller
    both support.

    Though the spi-nor device on imx6sx-sdb/imx6ul(l/z)-14x14-evk board
    do not support PP-1-4-4/PP-1-1-4, but if tx is 4 in dts file, it will also
    impact the read mode selection. For the spi-nor device on the upper mentioned
    boards, they support read 1-4-4 mode and read 1-1-4 mode according to the
    device internal sfdp register. But qspi host controller do not support
    read 1-4-4 mode. so need to set the tx to 1, let the common code finally
    select read 1-1-4 mode, PP-1-1-1 mode.

    Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
    Fixes: 0e30f47232ab ("mtd: spi-nor: add support for DTR protocol")
    Signed-off-by: Shawn Guo <shawnguo@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/arm/boot/dts/imx6sx-sdb.dts | 4 ++--
    arch/arm/boot/dts/imx6ul-14x14-evk.dtsi | 2 +-
    2 files changed, 3 insertions(+), 3 deletions(-)

    diff --git a/arch/arm/boot/dts/imx6sx-sdb.dts b/arch/arm/boot/dts/imx6sx-sdb.dts
    index 5a63ca615722..99f4cf777a38 100644
    --- a/arch/arm/boot/dts/imx6sx-sdb.dts
    +++ b/arch/arm/boot/dts/imx6sx-sdb.dts
    @@ -114,7 +114,7 @@
    compatible = "micron,n25q256a", "jedec,spi-nor";
    spi-max-frequency = <29000000>;
    spi-rx-bus-width = <4>;
    - spi-tx-bus-width = <4>;
    + spi-tx-bus-width = <1>;
    reg = <0>;
    };

    @@ -124,7 +124,7 @@
    compatible = "micron,n25q256a", "jedec,spi-nor";
    spi-max-frequency = <29000000>;
    spi-rx-bus-width = <4>;
    - spi-tx-bus-width = <4>;
    + spi-tx-bus-width = <1>;
    reg = <2>;
    };
    };
    diff --git a/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi b/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi
    index 779cc536566d..a3fde3316c73 100644
    --- a/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi
    +++ b/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi
    @@ -292,7 +292,7 @@
    compatible = "micron,n25q256a", "jedec,spi-nor";
    spi-max-frequency = <29000000>;
    spi-rx-bus-width = <4>;
    - spi-tx-bus-width = <4>;
    + spi-tx-bus-width = <1>;
    reg = <0>;
    };
    };
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-10-11 16:11    [W:4.305 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site