Commit 16c3e058 authored by Kuldeep Singh's avatar Kuldeep Singh Committed by Mark Brown

spi: spi-fsl-qspi: Introduce variable to fix different invalid master Id

Different platforms have different Master with different SourceID on
AHB bus. The 0X0E Master ID is used by cluster 3 in case of LS2088A.
So, patch introduce an invalid master id variable to fix invalid
mastered on different platforms.
Signed-off-by: default avatarSuresh Gupta <suresh.gupta@nxp.com>
Signed-off-by: default avatarKuldeep Singh <kuldeep.singh@nxp.com>
Link: https://lore.kernel.org/r/1569920356-8953-1-git-send-email-kuldeep.singh@nxp.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 1b0a2b2d
...@@ -63,6 +63,11 @@ ...@@ -63,6 +63,11 @@
#define QUADSPI_IPCR 0x08 #define QUADSPI_IPCR 0x08
#define QUADSPI_IPCR_SEQID(x) ((x) << 24) #define QUADSPI_IPCR_SEQID(x) ((x) << 24)
#define QUADSPI_BUF0CR 0x10
#define QUADSPI_BUF1CR 0x14
#define QUADSPI_BUF2CR 0x18
#define QUADSPI_BUFXCR_INVALID_MSTRID 0xe
#define QUADSPI_BUF3CR 0x1c #define QUADSPI_BUF3CR 0x1c
#define QUADSPI_BUF3CR_ALLMST_MASK BIT(31) #define QUADSPI_BUF3CR_ALLMST_MASK BIT(31)
#define QUADSPI_BUF3CR_ADATSZ(x) ((x) << 8) #define QUADSPI_BUF3CR_ADATSZ(x) ((x) << 8)
...@@ -184,6 +189,7 @@ ...@@ -184,6 +189,7 @@
struct fsl_qspi_devtype_data { struct fsl_qspi_devtype_data {
unsigned int rxfifo; unsigned int rxfifo;
unsigned int txfifo; unsigned int txfifo;
int invalid_mstrid;
unsigned int ahb_buf_size; unsigned int ahb_buf_size;
unsigned int quirks; unsigned int quirks;
bool little_endian; bool little_endian;
...@@ -192,6 +198,7 @@ struct fsl_qspi_devtype_data { ...@@ -192,6 +198,7 @@ struct fsl_qspi_devtype_data {
static const struct fsl_qspi_devtype_data vybrid_data = { static const struct fsl_qspi_devtype_data vybrid_data = {
.rxfifo = SZ_128, .rxfifo = SZ_128,
.txfifo = SZ_64, .txfifo = SZ_64,
.invalid_mstrid = QUADSPI_BUFXCR_INVALID_MSTRID,
.ahb_buf_size = SZ_1K, .ahb_buf_size = SZ_1K,
.quirks = QUADSPI_QUIRK_SWAP_ENDIAN, .quirks = QUADSPI_QUIRK_SWAP_ENDIAN,
.little_endian = true, .little_endian = true,
...@@ -200,6 +207,7 @@ static const struct fsl_qspi_devtype_data vybrid_data = { ...@@ -200,6 +207,7 @@ static const struct fsl_qspi_devtype_data vybrid_data = {
static const struct fsl_qspi_devtype_data imx6sx_data = { static const struct fsl_qspi_devtype_data imx6sx_data = {
.rxfifo = SZ_128, .rxfifo = SZ_128,
.txfifo = SZ_512, .txfifo = SZ_512,
.invalid_mstrid = QUADSPI_BUFXCR_INVALID_MSTRID,
.ahb_buf_size = SZ_1K, .ahb_buf_size = SZ_1K,
.quirks = QUADSPI_QUIRK_4X_INT_CLK | QUADSPI_QUIRK_TKT245618, .quirks = QUADSPI_QUIRK_4X_INT_CLK | QUADSPI_QUIRK_TKT245618,
.little_endian = true, .little_endian = true,
...@@ -208,6 +216,7 @@ static const struct fsl_qspi_devtype_data imx6sx_data = { ...@@ -208,6 +216,7 @@ static const struct fsl_qspi_devtype_data imx6sx_data = {
static const struct fsl_qspi_devtype_data imx7d_data = { static const struct fsl_qspi_devtype_data imx7d_data = {
.rxfifo = SZ_128, .rxfifo = SZ_128,
.txfifo = SZ_512, .txfifo = SZ_512,
.invalid_mstrid = QUADSPI_BUFXCR_INVALID_MSTRID,
.ahb_buf_size = SZ_1K, .ahb_buf_size = SZ_1K,
.quirks = QUADSPI_QUIRK_TKT253890 | QUADSPI_QUIRK_4X_INT_CLK, .quirks = QUADSPI_QUIRK_TKT253890 | QUADSPI_QUIRK_4X_INT_CLK,
.little_endian = true, .little_endian = true,
...@@ -216,6 +225,7 @@ static const struct fsl_qspi_devtype_data imx7d_data = { ...@@ -216,6 +225,7 @@ static const struct fsl_qspi_devtype_data imx7d_data = {
static const struct fsl_qspi_devtype_data imx6ul_data = { static const struct fsl_qspi_devtype_data imx6ul_data = {
.rxfifo = SZ_128, .rxfifo = SZ_128,
.txfifo = SZ_512, .txfifo = SZ_512,
.invalid_mstrid = QUADSPI_BUFXCR_INVALID_MSTRID,
.ahb_buf_size = SZ_1K, .ahb_buf_size = SZ_1K,
.quirks = QUADSPI_QUIRK_TKT253890 | QUADSPI_QUIRK_4X_INT_CLK, .quirks = QUADSPI_QUIRK_TKT253890 | QUADSPI_QUIRK_4X_INT_CLK,
.little_endian = true, .little_endian = true,
...@@ -224,6 +234,7 @@ static const struct fsl_qspi_devtype_data imx6ul_data = { ...@@ -224,6 +234,7 @@ static const struct fsl_qspi_devtype_data imx6ul_data = {
static const struct fsl_qspi_devtype_data ls1021a_data = { static const struct fsl_qspi_devtype_data ls1021a_data = {
.rxfifo = SZ_128, .rxfifo = SZ_128,
.txfifo = SZ_64, .txfifo = SZ_64,
.invalid_mstrid = QUADSPI_BUFXCR_INVALID_MSTRID,
.ahb_buf_size = SZ_1K, .ahb_buf_size = SZ_1K,
.quirks = 0, .quirks = 0,
.little_endian = false, .little_endian = false,
...@@ -233,6 +244,7 @@ static const struct fsl_qspi_devtype_data ls2080a_data = { ...@@ -233,6 +244,7 @@ static const struct fsl_qspi_devtype_data ls2080a_data = {
.rxfifo = SZ_128, .rxfifo = SZ_128,
.txfifo = SZ_64, .txfifo = SZ_64,
.ahb_buf_size = SZ_1K, .ahb_buf_size = SZ_1K,
.invalid_mstrid = 0x0,
.quirks = QUADSPI_QUIRK_TKT253890 | QUADSPI_QUIRK_BASE_INTERNAL, .quirks = QUADSPI_QUIRK_TKT253890 | QUADSPI_QUIRK_BASE_INTERNAL,
.little_endian = true, .little_endian = true,
}; };
...@@ -615,6 +627,7 @@ static int fsl_qspi_exec_op(struct spi_mem *mem, const struct spi_mem_op *op) ...@@ -615,6 +627,7 @@ static int fsl_qspi_exec_op(struct spi_mem *mem, const struct spi_mem_op *op)
void __iomem *base = q->iobase; void __iomem *base = q->iobase;
u32 addr_offset = 0; u32 addr_offset = 0;
int err = 0; int err = 0;
int invalid_mstrid = q->devtype_data->invalid_mstrid;
mutex_lock(&q->lock); mutex_lock(&q->lock);
...@@ -638,6 +651,10 @@ static int fsl_qspi_exec_op(struct spi_mem *mem, const struct spi_mem_op *op) ...@@ -638,6 +651,10 @@ static int fsl_qspi_exec_op(struct spi_mem *mem, const struct spi_mem_op *op)
qspi_writel(q, QUADSPI_SPTRCLR_BFPTRC | QUADSPI_SPTRCLR_IPPTRC, qspi_writel(q, QUADSPI_SPTRCLR_BFPTRC | QUADSPI_SPTRCLR_IPPTRC,
base + QUADSPI_SPTRCLR); base + QUADSPI_SPTRCLR);
qspi_writel(q, invalid_mstrid, base + QUADSPI_BUF0CR);
qspi_writel(q, invalid_mstrid, base + QUADSPI_BUF1CR);
qspi_writel(q, invalid_mstrid, base + QUADSPI_BUF2CR);
fsl_qspi_prepare_lut(q, op); fsl_qspi_prepare_lut(q, op);
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment