1 files changed, 12 insertions, 25 deletions

diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
index 90df34c4d26c..74a43b818d0e 100644
--- a/drivers/mtd/nand/mxc_nand.c
+++ b/drivers/mtd/nand/mxc_nand.c
@@ -41,7 +41,7 @@
 
 #define nfc_is_v21()            (cpu_is_mx25() || cpu_is_mx35())
 #define nfc_is_v1()             (cpu_is_mx31() || cpu_is_mx27() || cpu_is_mx21())
-#define nfc_is_v3_2()           cpu_is_mx51()
+#define nfc_is_v3_2()           (cpu_is_mx51() || cpu_is_mx53())
 #define nfc_is_v3()             nfc_is_v3_2()
 
 /* Addresses for NFC registers */
@@ -143,7 +143,6 @@
 struct mxc_nand_host {
         struct mtd_info         mtd;
         struct nand_chip        nand;
-        struct mtd_partition    *parts;
         struct device           *dev;
 
         void                    *spare0;
@@ -350,8 +349,7 @@ static void wait_op_done(struct mxc_nand_host *host, int useirq)
                         udelay(1);
                 }
                 if (max_retries < 0)
-                        DEBUG(MTD_DEBUG_LEVEL0, "%s: INT not set\n",
-                              __func__);
+                        pr_debug("%s: INT not set\n", __func__);
         }
 }
 
@@ -371,7 +369,7 @@ static void send_cmd_v3(struct mxc_nand_host *host, uint16_t cmd, int useirq)
  * waits for completion. */
 static void send_cmd_v1_v2(struct mxc_nand_host *host, uint16_t cmd, int useirq)
 {
-        DEBUG(MTD_DEBUG_LEVEL3, "send_cmd(host, 0x%x, %d)\n", cmd, useirq);
+        pr_debug("send_cmd(host, 0x%x, %d)\n", cmd, useirq);
 
         writew(cmd, NFC_V1_V2_FLASH_CMD);
         writew(NFC_CMD, NFC_V1_V2_CONFIG2);
@@ -387,8 +385,7 @@ static void send_cmd_v1_v2(struct mxc_nand_host *host, uint16_t cmd, int useirq)
                         udelay(1);
                 }
                 if (max_retries < 0)
-                        DEBUG(MTD_DEBUG_LEVEL0, "%s: RESET failed\n",
-                              __func__);
+                        pr_debug("%s: RESET failed\n", __func__);
         } else {
                 /* Wait for operation to complete */
                 wait_op_done(host, useirq);
@@ -411,7 +408,7 @@ static void send_addr_v3(struct mxc_nand_host *host, uint16_t addr, int islast)
  * a NAND command. */
 static void send_addr_v1_v2(struct mxc_nand_host *host, uint16_t addr, int islast)
 {
-        DEBUG(MTD_DEBUG_LEVEL3, "send_addr(host, 0x%x %d)\n", addr, islast);
+        pr_debug("send_addr(host, 0x%x %d)\n", addr, islast);
 
         writew(addr, NFC_V1_V2_FLASH_ADDR);
         writew(NFC_ADDR, NFC_V1_V2_CONFIG2);
@@ -561,8 +558,7 @@ static int mxc_nand_correct_data_v1(struct mtd_info *mtd, u_char *dat,
         uint16_t ecc_status = readw(NFC_V1_V2_ECC_STATUS_RESULT);
 
         if (((ecc_status & 0x3) == 2) || ((ecc_status >> 2) == 2)) {
-                DEBUG(MTD_DEBUG_LEVEL0,
-                      "MXC_NAND: HWECC uncorrectable 2-bit ECC error\n");
+                pr_debug("MXC_NAND: HWECC uncorrectable 2-bit ECC error\n");
                 return -1;
         }
 
@@ -849,7 +845,7 @@ static void preset_v1_v2(struct mtd_info *mtd)
                 writew(0xffff, NFC_V21_UNLOCKEND_BLKADDR3);
         } else if (nfc_is_v1()) {
                 writew(0x0, NFC_V1_UNLOCKSTART_BLKADDR);
-                writew(0x4000, NFC_V1_UNLOCKEND_BLKADDR);
+                writew(0xffff, NFC_V1_UNLOCKEND_BLKADDR);
         } else
                 BUG();
 
@@ -932,8 +928,7 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command,
         struct nand_chip *nand_chip = mtd->priv;
         struct mxc_nand_host *host = nand_chip->priv;
 
-        DEBUG(MTD_DEBUG_LEVEL3,
-              "mxc_nand_command (cmd = 0x%x, col = 0x%x, page = 0x%x)\n",
+        pr_debug("mxc_nand_command (cmd = 0x%x, col = 0x%x, page = 0x%x)\n",
               command, column, page_addr);
 
         /* Reset command state information */
@@ -1044,7 +1039,7 @@ static int __init mxcnd_probe(struct platform_device *pdev)
         struct mxc_nand_platform_data *pdata = pdev->dev.platform_data;
         struct mxc_nand_host *host;
         struct resource *res;
-        int err = 0, __maybe_unused nr_parts = 0;
+        int err = 0;
         struct nand_ecclayout *oob_smallpage, *oob_largepage;
 
         /* Allocate memory for MTD device structure and private data */
@@ -1179,7 +1174,7 @@ static int __init mxcnd_probe(struct platform_device *pdev)
                 this->bbt_td = &bbt_main_descr;
                 this->bbt_md = &bbt_mirror_descr;
                 /* update flash based bbt */
-                this->options |= NAND_USE_FLASH_BBT;
+                this->bbt_options |= NAND_BBT_USE_FLASH;
         }
 
         init_completion(&host->op_completion);
@@ -1231,16 +1226,8 @@ static int __init mxcnd_probe(struct platform_device *pdev)
         }
 
         /* Register the partitions */
-        nr_parts =
-            parse_mtd_partitions(mtd, part_probes, &host->parts, 0);
-        if (nr_parts > 0)
-                mtd_device_register(mtd, host->parts, nr_parts);
-        else if (pdata->parts)
-                mtd_device_register(mtd, pdata->parts, pdata->nr_parts);
-        else {
-                pr_info("Registering %s as whole device\n", mtd->name);
-                mtd_device_register(mtd, NULL, 0);
-        }
+        mtd_device_parse_register(mtd, part_probes, 0,
+                        pdata->parts, pdata->nr_parts);
 
         platform_set_drvdata(pdev, host);