mtd: rawnand: sunxi: move NFC_RANDOM_EN register offset in SoC caps

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.genoud@bootlin.com>
Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com>

diff --git a/drivers/mtd/nand/raw/sunxi_nand.c b/drivers/mtd/nand/raw/sunxi_nand.c
index c032cabb4dc9fcc0dc56a97c0c032e213dec2388..c35dff75de0648b21bc70167471222c736e94282 100644 (file)
--- a/drivers/mtd/nand/raw/sunxi_nand.c
+++ b/drivers/mtd/nand/raw/sunxi_nand.c
@@ -608,7 +608,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);
 }
 
@@ -620,7 +620,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);
 }
 
@@ -1730,6 +1730,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 e18feb77c93c374ac1b3d16b207ae949b1c7d212..2cbfc5c9c62a8789b5e6b2f891680c079bd9a9cf 100644 (file)
--- a/drivers/mtd/nand/raw/sunxi_nand.h
+++ b/drivers/mtd/nand/raw/sunxi_nand.h
@@ -141,8 +141,7 @@
 #define NFC_ECC_PIPELINE       BIT(3)
 #define NFC_ECC_EXCEPTION      BIT(4)
 #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)
@@ -178,6 +177,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;
@@ -188,6 +188,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 035b224bb437b33dee62f65333e58fa5dd6c411e..49ff56fb695ca1db97fed814dad7318d142d38b1 100644 (file)
--- 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
@@ -233,7 +234,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);