zynq: nand: Modify address cycles for Spansion S34ML01G

Modify the address cycles for Spansion S34ML01G as per datasheet

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/drivers/mtd/nand/zynq_nand.c b/drivers/mtd/nand/zynq_nand.c
index 5caea3d7c1e7f3822ad2f7ddb6039424072a5a6b..5aab2c724489a38e74b3f5a0b8dfb8a1f5d98369 100644 (file)
--- a/drivers/mtd/nand/zynq_nand.c
+++ b/drivers/mtd/nand/zynq_nand.c
@@ -132,6 +132,7 @@ struct zynq_nand_info {
        void __iomem            *nand_base;
        unsigned long           end_cmd_pending;
        unsigned long           end_cmd;
+       u8                      addr_cycle_chng;
 };
 
 #define ONDIE_ECC_FEATURE_ADDR 0x90
@@ -760,6 +761,7 @@ static void zynq_nand_cmd_function(struct mtd_info *mtd, unsigned int command,
 {
        struct nand_chip *chip = mtd->priv;
        const struct zynq_nand_command_format *curr_cmd = NULL;
+       u8 addr_cycles = 0;
        struct zynq_nand_info *xnand;
        void *cmd_addr;
        unsigned long cmd_data = 0;
@@ -809,8 +811,14 @@ static void zynq_nand_cmd_function(struct mtd_info *mtd, unsigned int command,
        else
                end_cmd = curr_cmd->end_cmd;
 
+       if (((command == NAND_CMD_READ0) ||
+            (command == NAND_CMD_SEQIN)) && xnand->addr_cycle_chng)
+               addr_cycles = curr_cmd->addr_cycles - 1;
+       else
+               addr_cycles = curr_cmd->addr_cycles;
+
        cmd_phase_addr = (unsigned long)xnand->nand_base        |
-                       (curr_cmd->addr_cycles << ADDR_CYCLES_SHIFT)    |
+                       (addr_cycles << ADDR_CYCLES_SHIFT)      |
                        (end_cmd_valid << END_CMD_VALID_SHIFT)          |
                        (COMMAND_PHASE)                                 |
                        (end_cmd << END_CMD_SHIFT)                      |
@@ -1102,6 +1110,9 @@ static int zynq_nand_init(struct nand_chip *nand_chip, int devnum)
        maf_id = nand_chip->read_byte(mtd);
        dev_id = nand_chip->read_byte(mtd);
 
+       if (maf_id == 0x01 && dev_id == 0xf1)
+               xnand->addr_cycle_chng = 1;
+
        if ((maf_id == 0x2c) && ((dev_id == 0xf1) ||
                                 (dev_id == 0xa1) || (dev_id == 0xb1) ||
                                 (dev_id == 0xaa) || (dev_id == 0xba) ||