mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-29 18:19:02 +00:00
9131cb44ff
Introduce EN7581 SoC support with currently rfb board supported. This is a new 64bit SoC from Airoha that is currently almost fully supported upstream with only the DTS missing. Setting source-only waiting for the full upstream support to be completed. Link: https://github.com/openwrt/openwrt/pull/16730 Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
56 lines
2.0 KiB
Diff
56 lines
2.0 KiB
Diff
From 2e6bbfe7b0c0607001b784082c2685b134174fac Mon Sep 17 00:00:00 2001
|
|
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Fri, 13 Sep 2024 23:07:13 +0200
|
|
Subject: [PATCH 1/2] spi: airoha: fix dirmap_{read,write} operations
|
|
|
|
SPI_NFI_READ_FROM_CACHE_DONE bit must be written at the end of
|
|
dirmap_read operation even if it is already set.
|
|
In the same way, SPI_NFI_LOAD_TO_CACHE_DONE bit must be written at the
|
|
end of dirmap_write operation even if it is already set.
|
|
For this reason use regmap_write_bits() instead of regmap_set_bits().
|
|
This patch fixes mtd_pagetest kernel module test.
|
|
|
|
Fixes: a403997c1201 ("spi: airoha: add SPI-NAND Flash controller driver")
|
|
Tested-by: Christian Marangi <ansuelsmth@gmail.com>
|
|
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Link: https://patch.msgid.link/20240913-airoha-spi-fixes-v1-1-de2e74ed4664@kernel.org
|
|
Signed-off-by: Mark Brown <broonie@kernel.org>
|
|
---
|
|
drivers/spi/spi-airoha-snfi.c | 18 ++++++++++++++----
|
|
1 file changed, 14 insertions(+), 4 deletions(-)
|
|
|
|
--- a/drivers/spi/spi-airoha-snfi.c
|
|
+++ b/drivers/spi/spi-airoha-snfi.c
|
|
@@ -739,8 +739,13 @@ static ssize_t airoha_snand_dirmap_read(
|
|
if (err)
|
|
return err;
|
|
|
|
- err = regmap_set_bits(as_ctrl->regmap_nfi, REG_SPI_NFI_SNF_STA_CTL1,
|
|
- SPI_NFI_READ_FROM_CACHE_DONE);
|
|
+ /*
|
|
+ * SPI_NFI_READ_FROM_CACHE_DONE bit must be written at the end
|
|
+ * of dirmap_read operation even if it is already set.
|
|
+ */
|
|
+ err = regmap_write_bits(as_ctrl->regmap_nfi, REG_SPI_NFI_SNF_STA_CTL1,
|
|
+ SPI_NFI_READ_FROM_CACHE_DONE,
|
|
+ SPI_NFI_READ_FROM_CACHE_DONE);
|
|
if (err)
|
|
return err;
|
|
|
|
@@ -870,8 +875,13 @@ static ssize_t airoha_snand_dirmap_write
|
|
if (err)
|
|
return err;
|
|
|
|
- err = regmap_set_bits(as_ctrl->regmap_nfi, REG_SPI_NFI_SNF_STA_CTL1,
|
|
- SPI_NFI_LOAD_TO_CACHE_DONE);
|
|
+ /*
|
|
+ * SPI_NFI_LOAD_TO_CACHE_DONE bit must be written at the end
|
|
+ * of dirmap_write operation even if it is already set.
|
|
+ */
|
|
+ err = regmap_write_bits(as_ctrl->regmap_nfi, REG_SPI_NFI_SNF_STA_CTL1,
|
|
+ SPI_NFI_LOAD_TO_CACHE_DONE,
|
|
+ SPI_NFI_LOAD_TO_CACHE_DONE);
|
|
if (err)
|
|
return err;
|
|
|