e89e9c412f
This is an automatically generated commit. When doing `git bisect`, consider `git bisect --skip`. Signed-off-by: Kenneth Kasilag <kenneth@kasilag.me> Link: https://github.com/openwrt/openwrt/pull/21019 Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>
65 lines
1.8 KiB
Diff
65 lines
1.8 KiB
Diff
From 70eec454f2d6cdfab547c262781acd38328e11a1 Mon Sep 17 00:00:00 2001
|
|
From: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
|
|
Date: Sun, 12 Oct 2025 15:17:00 +0300
|
|
Subject: [PATCH 09/14] spi: airoha: avoid setting of page/oob sizes in
|
|
REG_SPI_NFI_PAGEFMT
|
|
|
|
spi-airoha-snfi uses custom sector size in REG_SPI_NFI_SECCUS_SIZE
|
|
register, so setting of page/oob sizes in REG_SPI_NFI_PAGEFMT is not
|
|
required.
|
|
|
|
Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
|
|
Link: https://patch.msgid.link/20251012121707.2296160-10-mikhail.kshevetskiy@iopsys.eu
|
|
Signed-off-by: Mark Brown <broonie@kernel.org>
|
|
---
|
|
drivers/spi/spi-airoha-snfi.c | 38 -----------------------------------
|
|
1 file changed, 38 deletions(-)
|
|
|
|
--- a/drivers/spi/spi-airoha-snfi.c
|
|
+++ b/drivers/spi/spi-airoha-snfi.c
|
|
@@ -518,44 +518,6 @@ static int airoha_snand_nfi_config(struc
|
|
if (err)
|
|
return err;
|
|
|
|
- /* page format */
|
|
- switch (as_ctrl->nfi_cfg.spare_size) {
|
|
- case 26:
|
|
- val = FIELD_PREP(SPI_NFI_SPARE_SIZE, 0x1);
|
|
- break;
|
|
- case 27:
|
|
- val = FIELD_PREP(SPI_NFI_SPARE_SIZE, 0x2);
|
|
- break;
|
|
- case 28:
|
|
- val = FIELD_PREP(SPI_NFI_SPARE_SIZE, 0x3);
|
|
- break;
|
|
- default:
|
|
- val = FIELD_PREP(SPI_NFI_SPARE_SIZE, 0x0);
|
|
- break;
|
|
- }
|
|
-
|
|
- err = regmap_update_bits(as_ctrl->regmap_nfi, REG_SPI_NFI_PAGEFMT,
|
|
- SPI_NFI_SPARE_SIZE, val);
|
|
- if (err)
|
|
- return err;
|
|
-
|
|
- switch (as_ctrl->nfi_cfg.page_size) {
|
|
- case 2048:
|
|
- val = FIELD_PREP(SPI_NFI_PAGE_SIZE, 0x1);
|
|
- break;
|
|
- case 4096:
|
|
- val = FIELD_PREP(SPI_NFI_PAGE_SIZE, 0x2);
|
|
- break;
|
|
- default:
|
|
- val = FIELD_PREP(SPI_NFI_PAGE_SIZE, 0x0);
|
|
- break;
|
|
- }
|
|
-
|
|
- err = regmap_update_bits(as_ctrl->regmap_nfi, REG_SPI_NFI_PAGEFMT,
|
|
- SPI_NFI_PAGE_SIZE, val);
|
|
- if (err)
|
|
- return err;
|
|
-
|
|
/* sec num */
|
|
val = FIELD_PREP(SPI_NFI_SEC_NUM, as_ctrl->nfi_cfg.sec_num);
|
|
err = regmap_update_bits(as_ctrl->regmap_nfi, REG_SPI_NFI_CON,
|