[PATCH] qspi: versal-net: Add condition for tapdelay register

[Michal Simek]

st 16. 11. 2022 v 16:40 odesílatel Michal Simek <michal.simek at amd.com> napsal:
>
> From: Ashok Reddy Soma <ashok.reddy.soma at amd.com>
>
> Add CONFIG_ARCH_VERSAL_NET to select tapdelay register for versal-net.
>
> Signed-off-by: Ashok Reddy Soma <ashok.reddy.soma at amd.com>
> Signed-off-by: Michal Simek <michal.simek at amd.com>
> ---
>
>  drivers/spi/zynqmp_gqspi.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/spi/zynqmp_gqspi.c b/drivers/spi/zynqmp_gqspi.c
> index 49facc46d3c1..48eff777dfb3 100644
> --- a/drivers/spi/zynqmp_gqspi.c
> +++ b/drivers/spi/zynqmp_gqspi.c
> @@ -104,7 +104,8 @@
>  #define TAP_DLY_BYPASS_LQSPI_RX_VALUE  0x1
>  #define TAP_DLY_BYPASS_LQSPI_RX_SHIFT  2
>  #define GQSPI_DATA_DLY_ADJ_OFST                0x000001F8
> -#define IOU_TAPDLY_BYPASS_OFST !IS_ENABLED(CONFIG_ARCH_VERSAL) ? \
> +#define IOU_TAPDLY_BYPASS_OFST !(IS_ENABLED(CONFIG_ARCH_VERSAL) || \
> +                                IS_ENABLED(CONFIG_ARCH_VERSAL_NET)) ? \
>                                 0xFF180390 : 0xF103003C
>  #define GQSPI_LPBK_DLY_ADJ_LPBK_MASK   0x00000020
>  #define GQSPI_FREQ_37_5MHZ             37500000
> --
> 2.36.1
>

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