ramips: clean up the mt7621 nand flash driver hacks, add support for the xiaomi mir3g...

[openwrt/openwrt.git] / target / linux / ramips / patches-4.14 / 0040-nand-hack.patch

diff --git a/target/linux/ramips/patches-4.14/0040-nand-hack.patch b/target/linux/ramips/patches-4.14/0040-nand-hack.patch
index 7b616eca469ae418bdb85b43a5e681abcda05e6e..c906d7fa6a65c87a8d55eeb07e2f5160d2046553 100644 (file)
--- a/target/linux/ramips/patches-4.14/0040-nand-hack.patch
+++ b/target/linux/ramips/patches-4.14/0040-nand-hack.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/nand/nand_base.c
 +++ b/drivers/mtd/nand/nand_base.c
-@@ -1903,6 +1903,9 @@ static int nand_do_read_ops(struct mtd_i
+@@ -1908,6 +1908,9 @@ static int nand_do_read_ops(struct mtd_i
                                                 __func__, buf);
  
  read_retry:
@@ -10,7 +10,7 @@
                        if (nand_standard_page_accessors(&chip->ecc))
                                chip->cmdfunc(mtd, NAND_CMD_READ0, 0x00, page);
  
-@@ -1922,6 +1925,7 @@ read_retry:
+@@ -1927,6 +1930,7 @@ read_retry:
                        else
                                ret = chip->ecc.read_page(mtd, chip, bufpoi,
                                                          oob_required, page);
@@ -18,47 +18,42 @@
                        if (ret < 0) {
                                if (use_bufpoi)
                                        /* Invalidate page cache */
-@@ -3079,8 +3083,11 @@ int nand_erase_nand(struct mtd_info *mtd
-                   (page + pages_per_block))
-                       chip->pagebuf = -1;
+@@ -2761,9 +2765,14 @@ static int nand_do_write_ops(struct mtd_
+                       memset(chip->oob_poi, 0xff, mtd->oobsize);
+               }
+ 
+-              ret = nand_write_page(mtd, chip, column, bytes, wbuf,
+-                                    oob_required, page,
+-                                    (ops->mode == MTD_OPS_RAW));
++              if (chip->write_page)
++                      ret = chip->write_page(mtd, chip, column, bytes, wbuf,
++                                             oob_required, page,
++                                             (ops->mode == MTD_OPS_RAW));
++              else
++                      ret = nand_write_page(mtd, chip, column, bytes, wbuf,
++                                            oob_required, page,
++                                            (ops->mode == MTD_OPS_RAW));
+               if (ret)
+                       break;
  
-+#ifdef CONFIG_MTK_MTD_NAND
-+              status = chip->erase_mtk(mtd, page & chip->pagemask);
-+#else
-               status = chip->erase(mtd, page & chip->pagemask);
--
-+#endif
-               /* See if block erase succeeded */
-               if (status & NAND_STATUS_FAIL) {
-                       pr_debug("%s: failed erase, page 0x%08x\n",
-@@ -4210,6 +4217,7 @@ int nand_scan_ident(struct mtd_info *mtd
-                * cmdfunc() both expect cmd_ctrl() to be populated,
-                * so we need to check that that's the case
-                */
-+              printk("%s:%s[%d]%p %p %p\n", __FILE__, __func__, __LINE__, chip->cmdfunc, chip->select_chip, chip->cmd_ctrl);
-               pr_err("chip.cmd_ctrl() callback is not provided");
-               return -EINVAL;
-       }
---- a/drivers/mtd/nand/nand_device_list.h
-+++ b/drivers/mtd/nand/nand_device_list.h
-@@ -44,6 +44,8 @@ static const flashdev_info gen_FlashTabl
-       {0xADBC, 0x905554, 5, 16, 512, 128, 2048, 64, 0x10801011, "H9DA4GH4JJAMC", 0},
-     {0x01F1, 0x801D01, 4, 8, 128, 128, 2048, 64, 0x30C77fff, "S34ML01G100TF", 0},
-     {0x92F1, 0x8095FF, 4, 8, 128, 128, 2048, 64, 0x30C77fff, "F59L1G81A", 0},
-+      {0xC8DA, 0x909544, 5, 8, 256, 128, 2048, 64, 0x30C77fff, "F59L2G81A", 0},
-+      {0xC8DC, 0x909554, 5, 8, 512, 128, 2048, 64, 0x30C77fff, "F59L4G81A", 0},
-       {0xECD3, 0x519558, 5, 8, 1024, 128, 2048, 64, 0x44333, "K9K8G8000", 0},
-     {0xC2F1, 0x801DC2, 4, 8, 128, 128, 2048, 64, 0x30C77fff, "MX30LF1G08AA", 0},
-     {0x98D3, 0x902676, 5, 8, 1024, 256, 4096, 224, 0x00C25332, "TC58NVG3S0F", 0},
 --- a/include/linux/mtd/rawnand.h
 +++ b/include/linux/mtd/rawnand.h
-@@ -896,6 +896,10 @@ struct nand_chip {
+@@ -885,6 +885,9 @@ struct nand_chip {
+       int(*waitfunc)(struct mtd_info *mtd, struct nand_chip *this);
+       int (*erase)(struct mtd_info *mtd, int page);
+       int (*scan_bbt)(struct mtd_info *mtd);
++      int (*write_page)(struct mtd_info *mtd, struct nand_chip *chip,
++                      uint32_t offset, int data_len, const uint8_t *buf,
++                      int oob_required, int page, int raw);
+       int (*onfi_set_features)(struct mtd_info *mtd, struct nand_chip *chip,
+                       int feature_addr, uint8_t *subfeature_para);
+       int (*onfi_get_features)(struct mtd_info *mtd, struct nand_chip *chip,
+@@ -893,6 +896,9 @@ struct nand_chip {
        int (*setup_data_interface)(struct mtd_info *mtd, int chipnr,
                                    const struct nand_data_interface *conf);
  
 +#ifdef CONFIG_MTK_MTD_NAND
 +      int (*read_page)(struct mtd_info *mtd, struct nand_chip *chip, u8 *buf, int page);
-+      int (*erase_mtk)(struct mtd_info *mtd, int page);
 +#endif /* CONFIG_MTK_MTD_NAND */
  
        int chip_delay;