[PATCH 15/24] mtd: rawnand: sunxi: cosmetic: move NFC_RANDOM_EN register offset in SoC caps

[Richard Genoud]

NFC_RANDOM_{EN,DIRECTION} registers offset moved in H616

Let's make it a SoC capability.

NFC_RANDOM_DIRECTION also moved, but it's unused, just remove it.

No functional change.

Signed-off-by: Richard Genoud <richard.gen...@bootlin.com>
---
 drivers/mtd/nand/raw/sunxi_nand.c     | 5 +++--
 drivers/mtd/nand/raw/sunxi_nand.h     | 5 +++--
 drivers/mtd/nand/raw/sunxi_nand_spl.c | 3 ++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/drivers/mtd/nand/raw/sunxi_nand.c 
b/drivers/mtd/nand/raw/sunxi_nand.c
index 1b429e1cbb20..a9fce01fb89c 100644
--- a/drivers/mtd/nand/raw/sunxi_nand.c
+++ b/drivers/mtd/nand/raw/sunxi_nand.c
@@ -609,7 +609,7 @@ static void sunxi_nfc_randomizer_enable(struct mtd_info 
*mtd)
        if (!(nand->options & NAND_NEED_SCRAMBLING))
                return;
 
-       writel(readl(nfc->regs + NFC_REG_ECC_CTL) | NFC_RANDOM_EN,
+       writel(readl(nfc->regs + NFC_REG_ECC_CTL) | NFC_RANDOM_EN(nfc),
               nfc->regs + NFC_REG_ECC_CTL);
 }
 
@@ -621,7 +621,7 @@ static void sunxi_nfc_randomizer_disable(struct mtd_info 
*mtd)
        if (!(nand->options & NAND_NEED_SCRAMBLING))
                return;
 
-       writel(readl(nfc->regs + NFC_REG_ECC_CTL) & ~NFC_RANDOM_EN,
+       writel(readl(nfc->regs + NFC_REG_ECC_CTL) & ~NFC_RANDOM_EN(nfc),
               nfc->regs + NFC_REG_ECC_CTL);
 }
 
@@ -1731,6 +1731,7 @@ static const struct sunxi_nfc_caps sunxi_nfc_a10_caps = {
        .reg_pat_id = NFC_REG_A10_PAT_ID,
        .pat_found_mask = GENMASK(31, 16),
        .ecc_mode_mask = GENMASK(15, 12),
+       .random_en_mask = BIT(9),
 };
 
 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 a0ce098db3f9..99bee478665f 100644
--- a/drivers/mtd/nand/raw/sunxi_nand.h
+++ b/drivers/mtd/nand/raw/sunxi_nand.h
@@ -142,8 +142,7 @@
 #define NFC_ECC_EXCEPTION      BIT(4)
 #define NFC_ECC_BLOCK_SIZE_MSK BIT(5)
 #define NFC_ECC_BLOCK_512      BIT(5)
-#define NFC_RANDOM_EN          BIT(9)
-#define NFC_RANDOM_DIRECTION   BIT(10)
+#define NFC_RANDOM_EN(nfc)     ((nfc)->caps->random_en_mask)
 #define NFC_ECC_MODE_MSK(nfc)  ((nfc)->caps->ecc_mode_mask)
 #define NFC_ECC_MODE(nfc, x)   field_prep(NFC_ECC_MODE_MSK(nfc), (x))
 #define NFC_RANDOM_SEED_MSK    (0x7fff << 16)
@@ -179,6 +178,7 @@
  * @reg_pat_found:     Data Pattern Status Register
  * @pat_found_mask:    ECC_PAT_FOUND mask in NFC_REG_PAT_FOUND register
  * @ecc_mode_mask:     ECC_MODE mask in NFC_ECC_CTL register
+ * @random_en_mask:    RANDOM_EN mask in NFC_ECC_CTL register
  */
 struct sunxi_nfc_caps {
        bool has_ecc_block_512;
@@ -189,6 +189,7 @@ struct sunxi_nfc_caps {
        unsigned int reg_pat_found;
        unsigned int pat_found_mask;
        unsigned int ecc_mode_mask;
+       unsigned int random_en_mask;
 };
 
 #endif
diff --git a/drivers/mtd/nand/raw/sunxi_nand_spl.c 
b/drivers/mtd/nand/raw/sunxi_nand_spl.c
index 6879890c1536..714518d67740 100644
--- a/drivers/mtd/nand/raw/sunxi_nand_spl.c
+++ b/drivers/mtd/nand/raw/sunxi_nand_spl.c
@@ -54,6 +54,7 @@ const uint16_t random_seed[128] = {
 
 __maybe_unused static const struct sunxi_nfc_caps sunxi_nfc_a10_caps = {
        .has_ecc_block_512 = true,
+       .random_en_mask = BIT(9),
 };
 
 #define DEFAULT_TIMEOUT_US     100000
@@ -224,7 +225,7 @@ static int nand_read_page(const struct nfc_config *conf, 
u32 offs,
                /* Clear ECC status and restart ECC engine */
                writel(0, SUNXI_NFC_BASE + NFC_REG_ECC_ST);
                writel((rand_seed << 16) | (conf->ecc_strength << 12) |
-                      (conf->randomize ? NFC_RANDOM_EN : 0) |
+                      (conf->randomize ? NFC_RANDOM_EN(conf) : 0) |
                       ecc512_bit |
                       NFC_ECC_EN | NFC_ECC_EXCEPTION,
                       SUNXI_NFC_BASE + NFC_REG_ECC_CTL);