diff options
| author | Suresh Gupta <suresh.gupta@nxp.com> | 2017-05-17 09:09:12 (GMT) |
|---|---|---|
| committer | Xie Xiaobo <xiaobo.xie@nxp.com> | 2017-09-25 07:25:53 (GMT) |
| commit | 540acefa2f374f3500c8ab1aba2f75e048e752b8 (patch) | |
| tree | a01a2c298fb17dac2a5c68e3146483a9aa2b96bb /drivers/mtd | |
| parent | 2b537b7d4f5e6e938730dccf557cfbe979eaaae8 (diff) | |
| download | linux-540acefa2f374f3500c8ab1aba2f75e048e752b8.tar.xz | |
Revert "mtd: fsl-quadspi: disable AHB buffer prefetch"
As per Apps this patch/erratum is not required.
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/spi-nor/fsl-quadspi.c | 29 |
1 files changed, 6 insertions, 23 deletions
diff --git a/drivers/mtd/spi-nor/fsl-quadspi.c b/drivers/mtd/spi-nor/fsl-quadspi.c index 8fb7553..33ecc27 100644 --- a/drivers/mtd/spi-nor/fsl-quadspi.c +++ b/drivers/mtd/spi-nor/fsl-quadspi.c @@ -860,36 +860,19 @@ static void fsl_qspi_init_abh_read(struct fsl_qspi *q) { void __iomem *base = q->iobase; int seqid; - const struct fsl_qspi_devtype_data *devtype_data = q->devtype_data; /* AHB configuration for access buffer 0/1/2 .*/ qspi_writel(q, QUADSPI_BUFXCR_INVALID_MSTRID, base + QUADSPI_BUF0CR); qspi_writel(q, QUADSPI_BUFXCR_INVALID_MSTRID, base + QUADSPI_BUF1CR); qspi_writel(q, QUADSPI_BUFXCR_INVALID_MSTRID, base + QUADSPI_BUF2CR); - /* - * Errata: A-009282: QuadSPI data prefetch may result in incorrect data - * Workaround: Keep the read data size to 64 bits (8 bytes). - * This disables the prefetch on the AHB buffer and - * prevents this issue from occurring. + * Set ADATSZ with the maximum AHB buffer size to improve the + * read performance. */ - if (devtype_data->devtype == FSL_QUADSPI_LS2080A || - devtype_data->devtype == FSL_QUADSPI_LS1021A) { - - qspi_writel(q, QUADSPI_BUF3CR_ALLMST_MASK | - (1 << QUADSPI_BUF3CR_ADATSZ_SHIFT), - base + QUADSPI_BUF3CR); - - } else { - /* - * Set ADATSZ with the maximum AHB buffer size to improve the - * read performance. - */ - qspi_writel(q, QUADSPI_BUF3CR_ALLMST_MASK | - ((q->devtype_data->ahb_buf_size / 8) - << QUADSPI_BUF3CR_ADATSZ_SHIFT), - base + QUADSPI_BUF3CR); - } + qspi_writel(q, QUADSPI_BUF3CR_ALLMST_MASK | + ((q->devtype_data->ahb_buf_size / 8) + << QUADSPI_BUF3CR_ADATSZ_SHIFT), + base + QUADSPI_BUF3CR); /* We only use the buffer3 */ qspi_writel(q, 0, base + QUADSPI_BUF0IND); |