mtd: rawnand: sunxi: introduce reg_pat_id in sunxi_nfc_caps

The H6/H616 pattern ID register is not at the same offset as the
A10/A23 one, so move its offset into sunxi_nfc_caps.

No functional change.

Signed-off-by: Richard Genoud <richard.genoud@bootlin.com>
Reviewed-by: Jernej Skrabec <jernej.skrabec@gmail.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>

diff --git a/drivers/mtd/nand/raw/sunxi_nand.c b/drivers/mtd/nand/raw/sunxi_nand.c
index 7dfc50a788e227fa23c13167642ddf0ec31edcb1..3cb84e502ad7d7f9c3f29bcfb4878fe7f4d9cd35 100644 (file)
--- a/drivers/mtd/nand/raw/sunxi_nand.c
+++ b/drivers/mtd/nand/raw/sunxi_nand.c
@@ -55,7 +55,8 @@
 #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_REG_PAT_ID(nfc) (nfc->caps->reg_pat_id)
+#define NFC_REG_A10_PAT_ID     0x00A4
 #define NFC_REG_MDMA_ADDR      0x00C0
 #define NFC_REG_MDMA_CNT       0x00C4
 #define NFC_RAM0_BASE          0x0400
@@ -238,6 +239,7 @@ static inline struct sunxi_nand_chip *to_sunxi_nand(struct nand_chip *nand)
  * @reg_io_data:       I/O data register
  * @reg_ecc_err_cnt:   ECC error counter register
  * @reg_user_data:     User data register
+ * @reg_pat_id:                Pattern ID Register
  * @reg_pat_found:     Data Pattern Status Register
  * @random_en_mask:    RANDOM_EN mask in NFC_ECC_CTL register
  * @random_dir_mask:   RANDOM_DIRECTION mask in NFC_ECC_CTL register
@@ -253,6 +255,7 @@ struct sunxi_nfc_caps {
        unsigned int reg_io_data;
        unsigned int reg_ecc_err_cnt;
        unsigned int reg_user_data;
+       unsigned int reg_pat_id;
        unsigned int reg_pat_found;
        unsigned int random_en_mask;
        unsigned int random_dir_mask;
@@ -813,7 +816,7 @@ static int sunxi_nfc_hw_ecc_correct(struct nand_chip *nand, u8 *data, u8 *oob,
        if (pattern_found & BIT(step)) {
                u8 pattern;
 
-               if (unlikely(!(readl(nfc->regs + NFC_REG_PAT_ID) & 0x1))) {
+               if (unlikely(!(readl(nfc->regs + NFC_REG_PAT_ID(nfc)) & 0x1))) {
                        pattern = 0x0;
                } else {
                        pattern = 0xff;
@@ -2233,6 +2236,7 @@ static const struct sunxi_nfc_caps sunxi_nfc_a10_caps = {
        .reg_io_data = NFC_REG_A10_IO_DATA,
        .reg_ecc_err_cnt = NFC_REG_A10_ECC_ERR_CNT,
        .reg_user_data = NFC_REG_A10_USER_DATA,
+       .reg_pat_id = NFC_REG_A10_PAT_ID,
        .reg_pat_found = NFC_REG_ECC_ST,
        .random_en_mask = BIT(9),
        .random_dir_mask = BIT(10),
@@ -2249,6 +2253,7 @@ static const struct sunxi_nfc_caps sunxi_nfc_a23_caps = {
        .reg_io_data = NFC_REG_A23_IO_DATA,
        .reg_ecc_err_cnt = NFC_REG_A10_ECC_ERR_CNT,
        .reg_user_data = NFC_REG_A10_USER_DATA,
+       .reg_pat_id = NFC_REG_A10_PAT_ID,
        .reg_pat_found = NFC_REG_ECC_ST,
        .random_en_mask = BIT(9),
        .random_dir_mask = BIT(10),