From: Richard Genoud Date: Fri, 23 Jan 2026 11:44:44 +0000 (+0100) Subject: mtd: rawnand: sunxi: move USER_DATA register offset in SoC caps X-Git-Tag: v2026.04-rc2~24^2~17 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb66861acc8f7efc398a7ed5eec3384c23eab16f;p=thirdparty%2Fu-boot.git mtd: rawnand: sunxi: move USER_DATA register offset in SoC caps USER_DATA register offset moved in H616, so let's make it a SoC cap Reviewed-by: Andre Przywara Signed-off-by: Richard Genoud Signed-off-by: Michael Trimarchi --- diff --git a/drivers/mtd/nand/raw/sunxi_nand.c b/drivers/mtd/nand/raw/sunxi_nand.c index 6699a577958..942789569e1 100644 --- a/drivers/mtd/nand/raw/sunxi_nand.c +++ b/drivers/mtd/nand/raw/sunxi_nand.c @@ -766,7 +766,7 @@ static int sunxi_nfc_hw_ecc_read_chunk(struct mtd_info *mtd, * Retrieve the corrected OOB bytes. */ sunxi_nfc_user_data_to_buf(readl(nfc->regs + - NFC_REG_USER_DATA(0)), + NFC_REG_USER_DATA(nfc, 0)), oob); /* De-randomize the Bad Block Marker. */ @@ -837,10 +837,10 @@ static int sunxi_nfc_hw_ecc_write_chunk(struct mtd_info *mtd, memcpy(user_data, oob, 4); sunxi_nfc_randomize_bbm(mtd, page, user_data); writel(sunxi_nfc_buf_to_user_data(user_data), - nfc->regs + NFC_REG_USER_DATA(0)); + nfc->regs + NFC_REG_USER_DATA(nfc, 0)); } else { writel(sunxi_nfc_buf_to_user_data(oob), - nfc->regs + NFC_REG_USER_DATA(0)); + nfc->regs + NFC_REG_USER_DATA(nfc, 0)); } if (data_off + ecc->size != oob_off) @@ -1713,6 +1713,7 @@ static int sunxi_nand_probe(struct udevice *dev) static const struct sunxi_nfc_caps sunxi_nfc_a10_caps = { .nstrengths = 9, .reg_ecc_err_cnt = NFC_REG_A10_ECC_ERR_CNT, + .reg_user_data = NFC_REG_A10_USER_DATA, }; static const struct udevice_id sunxi_nand_ids[] = { diff --git a/drivers/mtd/nand/raw/sunxi_nand.h b/drivers/mtd/nand/raw/sunxi_nand.h index b961f2ef3bf..1977d1bd8ea 100644 --- a/drivers/mtd/nand/raw/sunxi_nand.h +++ b/drivers/mtd/nand/raw/sunxi_nand.h @@ -43,7 +43,8 @@ #define NFC_REG_DEBUG 0x003C #define NFC_REG_A10_ECC_ERR_CNT 0x0040 #define NFC_REG_ECC_ERR_CNT(nfc, x) (((nfc)->caps->reg_ecc_err_cnt + (x)) & ~0x3) -#define NFC_REG_USER_DATA(x) (0x0050 + ((x) * 4)) +#define NFC_REG_A10_USER_DATA 0x0050 +#define NFC_REG_USER_DATA(nfc, x) ((nfc)->caps->reg_user_data + ((x) * 4)) #define NFC_REG_SPARE_AREA 0x00A0 #define NFC_REG_PAT_ID 0x00A4 #define NFC_RAM0_BASE 0x0400 @@ -160,10 +161,12 @@ * * @nstrengths: Number of element of ECC strengths array * @reg_ecc_err_cnt: ECC error counter register + * @reg_user_data: User data register */ struct sunxi_nfc_caps { unsigned int nstrengths; unsigned int reg_ecc_err_cnt; + unsigned int reg_user_data; }; #endif