Prepare the future use of an helper to move the data pointer (the
column) of the NAND chip by renaming nand_reset_column() to
nand_change_column(). Resetting the column is just a matter of giving 0
as argument.

Signed-off-by: Miquel Raynal <miquel.ray...@bootlin.com>
---
 drivers/mtd/nand/sunxi_nand_spl.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/mtd/nand/sunxi_nand_spl.c 
b/drivers/mtd/nand/sunxi_nand_spl.c
index 2fa1f70d9d..8c97834ec2 100644
--- a/drivers/mtd/nand/sunxi_nand_spl.c
+++ b/drivers/mtd/nand/sunxi_nand_spl.c
@@ -241,7 +241,7 @@ static int nand_load_page(const struct nfc_config *conf, 
u32 offs)
                             ((conf->addr_cycles - 1) << NFC_ADDR_NUM_OFFSET));
 }
 
-static int nand_reset_column(void)
+static int nand_change_column(u16 column)
 {
        int ret;
 
@@ -249,7 +249,7 @@ static int nand_reset_column(void)
               (NFC_CMD_RNDOUT << NFC_RANDOM_READ_CMD0_OFFSET) |
               (NFC_CMD_RNDOUTSTART << NFC_READ_CMD_OFFSET),
               SUNXI_NFC_BASE + NFC_RCMD_SET);
-       writel(0, SUNXI_NFC_BASE + NFC_ADDR_LOW);
+       writel(column, SUNXI_NFC_BASE + NFC_ADDR_LOW);
 
        ret = nand_exec_cmd(NFC_SEND_CMD1 | NFC_SEND_CMD2 | NFC_RAW_CMD |
                            (1 << NFC_ADDR_NUM_OFFSET) | NFC_SEND_ADDR |
@@ -414,7 +414,7 @@ static int nand_detect_ecc_config(struct nfc_config *conf, 
u32 offs,
                     conf->ecc_strength >= 0;
                     conf->ecc_strength--) {
                        conf->randomize = false;
-                       if (nand_reset_column())
+                       if (nand_change_column(0))
                                return -EIO;
 
                        /*
@@ -434,7 +434,7 @@ static int nand_detect_ecc_config(struct nfc_config *conf, 
u32 offs,
                        conf->randomize = true;
                        conf->nseeds = ARRAY_SIZE(random_seed);
                        do {
-                               if (nand_reset_column())
+                               if (nand_change_column(0))
                                        return -EIO;
 
                                if (!nand_read_page(conf, offs, dest,
@@ -526,7 +526,7 @@ static int nand_read_buffer(struct nfc_config *conf, 
uint32_t offs,
                        /* Try to adjust ->nseeds and read the page again... */
                        conf->nseeds = cur_seed;
 
-                       if (nand_reset_column())
+                       if (nand_change_column(0))
                                return -EIO;
 
                        /* ... it still fails => it's a real corruption. */
-- 
2.14.1

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Reply via email to