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

[openwrt/openwrt.git] / target / linux / ramips / patches-4.14 / 0039-mtd-add-mt7621-nand-support.patch

diff --git a/target/linux/ramips/patches-4.14/0039-mtd-add-mt7621-nand-support.patch b/target/linux/ramips/patches-4.14/0039-mtd-add-mt7621-nand-support.patch
index 97e434466546f5620e25bb6057d1928d2e84b6dd..f5cdfc9bc3520da833fd004d7b21c70bb7371033 100644 (file)
--- a/target/linux/ramips/patches-4.14/0039-mtd-add-mt7621-nand-support.patch
+++ b/target/linux/ramips/patches-4.14/0039-mtd-add-mt7621-nand-support.patch
@@ -1299,7 +1299,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 +
 --- /dev/null
 +++ b/drivers/mtd/nand/mtk_nand2.c
-@@ -0,0 +1,2363 @@
+@@ -0,0 +1,2365 @@
 +/******************************************************************************
 +* mtk_nand2.c - MTK NAND Flash Device Driver
 + *
@@ -2748,7 +2748,8 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 +{
 +      struct nand_chip *chip = (struct nand_chip *)mtd->priv;
 +
-+      chip->erase(mtd, page);
++      chip->cmdfunc(mtd, NAND_CMD_ERASE1, -1, page);
++      chip->cmdfunc(mtd, NAND_CMD_ERASE2, -1, -1);
 +
 +      return chip->waitfunc(mtd, chip);
 +}
@@ -3431,7 +3432,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 +      nand_chip->write_page = mtk_nand_write_page;
 +      nand_chip->ecc.write_oob = mtk_nand_write_oob;
 +      nand_chip->block_markbad = mtk_nand_block_markbad;   // need to add nand_get_device()/nand_release_device().
-+      nand_chip->erase_mtk = mtk_nand_erase;
 +      nand_chip->read_page = mtk_nand_read_page;
 +      nand_chip->ecc.read_oob = mtk_nand_read_oob;
 +      nand_chip->block_bad = mtk_nand_block_bad;
@@ -3562,6 +3562,8 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 +              goto out;
 +      }
 +
++      nand_chip->erase = mtk_nand_erase;
++
 +      g_page_size = mtd->writesize;
 +      platform_set_drvdata(pdev, host);
 +      if (hw->nfi_bus_width == 16) {
@@ -4303,7 +4305,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 +#endif /* __NAND_DEF_H__ */
 --- /dev/null
 +++ b/drivers/mtd/nand/nand_device_list.h
-@@ -0,0 +1,56 @@
+@@ -0,0 +1,59 @@
 +/* Copyright Statement:
 + *
 + * This software/firmware and related documentation ("MediaTek Software") are
@@ -4350,6 +4352,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 +      {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},
++      {0xC8D1, 0x809540, 4, 8, 128, 128, 2048, 64, 0x30C77fff, "F59L1G81MA", 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},