projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3ddda95)
MLK-10664: mtd: nand: change the maxchips for i.MX7D
authorHan Xu <b45815@freescale.com>
Wed, 15 Apr 2015 20:19:43 +0000 (15:19 -0500)
committerNitin Garg <nitin.garg@nxp.com>
Mon, 19 Mar 2018 19:47:31 +0000 (14:47 -0500)
change the maximum chips for i.MX7D, this part was missed when adding
i.MX7D NAND support.

Signed-off-by: Han Xu <b45815@freescale.com>
(cherry picked from commit: 313d4d5e701dd6a28dc7d2bd84094b8fbdb7f9ca)

drivers/mtd/nand/gpmi-nand/gpmi-nand.c patch | blob | history

diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
index 4be7790..0985090 100644 (file)
--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
@@ -2058,7 +2058,8 @@ static int gpmi_nand_init(struct gpmi_nand_data *this)
        if (ret)
                goto err_out;
 
-       ret = nand_scan_ident(mtd, GPMI_IS_MX6(this) ? 2 : 1, NULL);
+       ret = nand_scan_ident(mtd, GPMI_IS_MX6(this) || GPMI_IS_MX7(this)\
+                               ? 2 : 1, NULL);
        if (ret)
                goto err_out;