Merge tag 'nand/for-4.18' of git://git.infradead.org/linux-mtd into mtd/next

Core changes:
- Add Miquel as a NAND maintainer
- Add access mode to the nand_page_io_req struct
- Fix kernel-doc in rawnand.h
- Support bit-wise majority to recover from corrupted ONFI parameter
  pages
- Stop checking FAIL bit after a SET_FEATURES, as documented in the
  ONFI spec

Raw NAND Driver changes:
- Fix and cleanup the error path of many NAND controller drivers
- GPMI:
  * Cleanup/simplification of a few aspects in the driver
  * Take ECC setup specified in the DT into account
- sunxi: remove support for GPIO-based R/B polling
- MTK:
  * Use of_device_get_match_data() instead of of_match_device()
  * Add an entry in MAINTAINERS for this driver
  * Fix nand-ecc-step-size and nand-ecc-strength description in the DT
    bindings doc
- fsl_ifc: fix ->cmdfunc() to read more than one ONFI parameter page

OneNAND driver changes:
- samsung: use dev_get_drvdata() instead of platform_get_drvdata()

22 files changed, 328 insertions, 416 deletions

diff --git a/Documentation/devicetree/bindings/mtd/gpmi-nand.txt b/Documentation/devicetree/bindings/mtd/gpmi-nand.txt
index b289ef3c1b7e..393588385c6e 100644
--- a/Documentation/devicetree/bindings/mtd/gpmi-nand.txt
+++ b/Documentation/devicetree/bindings/mtd/gpmi-nand.txt
@@ -47,6 +47,11 @@ Optional properties:
                        partitions written from Linux with this feature
                        turned on may not be accessible by the BootROM
                        code.
+  - nand-ecc-strength: integer representing the number of bits to correct
+                       per ECC step. Needs to be a multiple of 2.
+  - nand-ecc-step-size: integer representing the number of data bytes
+                       that are covered by a single ECC step. The driver
+                       supports 512 and 1024.
 
 The device tree may optionally contain sub-nodes describing partitions of the
 address space. See partition.txt for more detail.
diff --git a/Documentation/devicetree/bindings/mtd/mtk-nand.txt b/Documentation/devicetree/bindings/mtd/mtk-nand.txt
index 1c88526dedfc..f20ab4abd214 100644
--- a/Documentation/devicetree/bindings/mtd/mtk-nand.txt
+++ b/Documentation/devicetree/bindings/mtd/mtk-nand.txt
@@ -50,14 +50,19 @@ Optional:
 - nand-on-flash-bbt:    Store BBT on NAND Flash.
 - nand-ecc-mode:        the NAND ecc mode (check driver for supported modes)
 - nand-ecc-step-size:   Number of data bytes covered by a single ECC step.
-                        valid values: 512 and 1024.
+                        valid values:
+                        512 and 1024 on mt2701 and mt2712.
+                        512 only on mt7622.
                         1024 is recommended for large page NANDs.
 - nand-ecc-strength:    Number of bits to correct per ECC step.
-                        The valid values that the controller supports are: 4, 6,
-                        8, 10, 12, 14, 16, 18, 20, 22, 24, 28, 32, 36, 40, 44,
-                        48, 52, 56, 60.
+                        The valid values that each controller supports:
+                        mt2701: 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 28,
+                                32, 36, 40, 44, 48, 52, 56, 60.
+                        mt2712: 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 28,
+                                32, 36, 40, 44, 48, 52, 56, 60, 68, 72, 80.
+                        mt7622: 4, 6, 8, 10, 12, 14, 16.
                         The strength should be calculated as follows:
-                        E = (S - F) * 8 / 14
+                        E = (S - F) * 8 / B
                         S = O / (P / Q)
                                 E :     nand-ecc-strength.
                                 S :     spare size per sector.
@@ -66,6 +71,15 @@ Optional:
                                 O :     oob size.
                                 P :     page size.
                                 Q :     nand-ecc-step-size.
+                                B :     number of parity bits needed to correct
+                                        1 bitflip.
+                                        According to MTK NAND controller design,
+                                        this number depends on max ecc step size
+                                        that MTK NAND controller supports.
+                                        If max ecc step size supported is 1024,
+                                        then it should be always 14. And if max
+                                        ecc step size is 512, then it should be
+                                        always 13.
                         If the result does not match any one of the listed
                         choices above, please select the smaller valid value from
                         the list.
diff --git a/Documentation/devicetree/bindings/mtd/sunxi-nand.txt b/Documentation/devicetree/bindings/mtd/sunxi-nand.txt
index 0734f03bf3d3..dcd5a5d80dc0 100644
--- a/Documentation/devicetree/bindings/mtd/sunxi-nand.txt
+++ b/Documentation/devicetree/bindings/mtd/sunxi-nand.txt
@@ -22,8 +22,6 @@ Optional properties:
 - reset : phandle + reset specifier pair
 - reset-names : must contain "ahb"
 - allwinner,rb : shall contain the native Ready/Busy ids.
- or
-- rb-gpios : shall contain the gpios used as R/B pins.
 - nand-ecc-mode : one of the supported ECC modes ("hw", "soft", "soft_bch" or
                   "none")
 
diff --git a/MAINTAINERS b/MAINTAINERS
index 0a1410d5a621..634abf4569c4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8941,6 +8941,13 @@ L:	linux-wireless@vger.kernel.org
 S:      Maintained
 F:      drivers/net/wireless/mediatek/mt7601u/
 
+MEDIATEK NAND CONTROLLER DRIVER
+M:      Xiaolei Li <xiaolei.li@mediatek.com>
+L:      linux-mtd@lists.infradead.org
+S:      Maintained
+F:      drivers/mtd/nand/raw/mtk_*
+F:      Documentation/devicetree/bindings/mtd/mtk-nand.txt
+
 MEDIATEK RANDOM NUMBER GENERATOR SUPPORT
 M:      Sean Wang <sean.wang@mediatek.com>
 S:      Maintained
@@ -9574,6 +9581,7 @@ F:	drivers/net/ethernet/myricom/myri10ge/
 
 NAND FLASH SUBSYSTEM
 M:      Boris Brezillon <boris.brezillon@bootlin.com>
+M:      Miquel Raynal <miquel.raynal@bootlin.com>
 R:      Richard Weinberger <richard@nod.at>
 L:      linux-mtd@lists.infradead.org
 W:      http://www.linux-mtd.infradead.org/
diff --git a/drivers/mtd/nand/onenand/samsung.c b/drivers/mtd/nand/onenand/samsung.c
index 2e9d076e445a..4cce4c0311ca 100644
--- a/drivers/mtd/nand/onenand/samsung.c
+++ b/drivers/mtd/nand/onenand/samsung.c
@@ -958,8 +958,7 @@ static int s3c_onenand_remove(struct platform_device *pdev)
 
 static int s3c_pm_ops_suspend(struct device *dev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct mtd_info *mtd = platform_get_drvdata(pdev);
+        struct mtd_info *mtd = dev_get_drvdata(dev);
         struct onenand_chip *this = mtd->priv;
 
         this->wait(mtd, FL_PM_SUSPENDED);
@@ -968,8 +967,7 @@ static int s3c_pm_ops_suspend(struct device *dev)
 
 static  int s3c_pm_ops_resume(struct device *dev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct mtd_info *mtd = platform_get_drvdata(pdev);
+        struct mtd_info *mtd = dev_get_drvdata(dev);
         struct onenand_chip *this = mtd->priv;
 
         this->unlock_all(mtd);
diff --git a/drivers/mtd/nand/raw/davinci_nand.c b/drivers/mtd/nand/raw/davinci_nand.c
index 0f09518d980f..7255a0d94374 100644
--- a/drivers/mtd/nand/raw/davinci_nand.c
+++ b/drivers/mtd/nand/raw/davinci_nand.c
@@ -27,7 +27,6 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/err.h>
-#include <linux/clk.h>
 #include <linux/io.h>
 #include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
@@ -55,7 +54,6 @@ struct davinci_nand_info {
         struct nand_chip        chip;
 
         struct device           *dev;
-        struct clk              *clk;