Commit ad99252f authored by Haibo Chen's avatar Haibo Chen Committed by Wen Zhiwei
Browse files

spi: fspi: add support for imx8ulp 

stable inclusion
from stable-v6.6.54
commit 236eb2f95ad00269d72239474c0af52f8e6d7449
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAZ3K2

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=236eb2f95ad00269d72239474c0af52f8e6d7449



--------------------------------

commit 9228956a620553d7fd17f703a37a26c91e4d92ab upstream.

The flexspi on imx8ulp only has 16 LUTs, different with others which
have up to 32 LUTs.

Add a separate compatible string and nxp_fspi_devtype_data to support
flexspi on imx8ulp.

Fixes: ef89fd56 ("arm64: dts: imx8ulp: add flexspi node")
Cc: stable@kernel.org
Signed-off-by: default avatarHaibo Chen <haibo.chen@nxp.com>
Reviewed-by: default avatarFrank Li <Frank.Li@nxp.com>
Link: https://patch.msgid.link/20240905094338.1986871-4-haibo.chen@nxp.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent f76f68c8

drivers/spi/spi-nxp-fspi.c

+10 −0
Original line number Diff line number Diff line
@@ -371,6 +371,15 @@ static struct nxp_fspi_devtype_data imx8dxl_data = { 
	.little_endian = true,  /* little-endian    */

};



static struct nxp_fspi_devtype_data imx8ulp_data = {

	.rxfifo = SZ_512,       /* (64  * 64 bits)  */

	.txfifo = SZ_1K,        /* (128 * 64 bits)  */

	.ahb_buf_size = SZ_2K,  /* (256 * 64 bits)  */

	.quirks = 0,

	.lut_num = 16,

	.little_endian = true,  /* little-endian    */

};



struct nxp_fspi {

	void __iomem *iobase;

	void __iomem *ahb_addr;
@@ -1297,6 +1306,7 @@ static const struct of_device_id nxp_fspi_dt_ids[] = { 
	{ .compatible = "nxp,imx8mp-fspi", .data = (void *)&imx8mm_data, },

	{ .compatible = "nxp,imx8qxp-fspi", .data = (void *)&imx8qxp_data, },

	{ .compatible = "nxp,imx8dxl-fspi", .data = (void *)&imx8dxl_data, },

	{ .compatible = "nxp,imx8ulp-fspi", .data = (void *)&imx8ulp_data, },

	{ /* sentinel */ }

};

MODULE_DEVICE_TABLE(of, nxp_fspi_dt_ids);