]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
spi: airoha: avoid setting of page/oob sizes in REG_SPI_NFI_PAGEFMT
authorMikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
Sun, 12 Oct 2025 12:17:00 +0000 (15:17 +0300)
committerMark Brown <broonie@kernel.org>
Fri, 17 Oct 2025 12:30:49 +0000 (13:30 +0100)
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

index 744eeb2b24efcc324e75c90b793eb9041251b552..719b424d4ccec48b7232d72ede6e1df4430eb61c 100644 (file)
@@ -518,44 +518,6 @@ static int airoha_snand_nfi_config(struct airoha_snand_ctrl *as_ctrl)
        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,