diff options
| author | Mark Brown <broonie@kernel.org> | 2023-10-30 16:20:58 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-10-30 16:20:58 +0300 |
| commit | 1b2e883e1af895b62808b044ac96b77e7c9017b1 (patch) | |
| tree | 5be3c6044108f29e2f027b5e0a70862de35840eb /drivers/spi/spi-nxp-fspi.c | |
| parent | 75223bbea840e125359fc63942b5f93462b474c6 (diff) | |
| parent | c3aa5cb264a38ae9bbcce32abca4c155af0456df (diff) | |
| download | linux-1b2e883e1af895b62808b044ac96b77e7c9017b1.tar.xz | |
spi: Merge up fix
One small fix that didn't seem worth sending before the merge window.
Diffstat (limited to 'drivers/spi/spi-nxp-fspi.c')
| -rw-r--r-- | drivers/spi/spi-nxp-fspi.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/spi/spi-nxp-fspi.c b/drivers/spi/spi-nxp-fspi.c index 5dc950c87fe1..e13f678f2395 100644 --- a/drivers/spi/spi-nxp-fspi.c +++ b/drivers/spi/spi-nxp-fspi.c @@ -759,7 +759,7 @@ static int nxp_fspi_read_ahb(struct nxp_fspi *f, const struct spi_mem_op *op) f->memmap_len = len > NXP_FSPI_MIN_IOMAP ? len : NXP_FSPI_MIN_IOMAP; - f->ahb_addr = ioremap_wc(f->memmap_phy + f->memmap_start, + f->ahb_addr = ioremap(f->memmap_phy + f->memmap_start, f->memmap_len); if (!f->ahb_addr) { @@ -1084,6 +1084,13 @@ static int nxp_fspi_default_setup(struct nxp_fspi *f) fspi_writel(f, FSPI_AHBCR_PREF_EN | FSPI_AHBCR_RDADDROPT, base + FSPI_AHBCR); + /* Reset the FLSHxCR1 registers. */ + reg = FSPI_FLSHXCR1_TCSH(0x3) | FSPI_FLSHXCR1_TCSS(0x3); + fspi_writel(f, reg, base + FSPI_FLSHA1CR1); + fspi_writel(f, reg, base + FSPI_FLSHA2CR1); + fspi_writel(f, reg, base + FSPI_FLSHB1CR1); + fspi_writel(f, reg, base + FSPI_FLSHB2CR1); + /* AHB Read - Set lut sequence ID for all CS. */ fspi_writel(f, SEQID_LUT, base + FSPI_FLSHA1CR2); fspi_writel(f, SEQID_LUT, base + FSPI_FLSHA2CR2); |