From 59a3a6b5dc2c46cbf9e842893dcd0211c46be9ca Mon Sep 17 00:00:00 2001 From: Han Xu Date: Wed, 15 Apr 2015 15:19:43 -0500 Subject: MLK-10664: mtd: nand: change the maxchips for i.MX7D change the maximum chips for i.MX7D, this part was missed when adding i.MX7D NAND support. Signed-off-by: Han Xu (cherry picked from commit: 313d4d5e701dd6a28dc7d2bd84094b8fbdb7f9ca) --- drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'drivers/mtd/nand/gpmi-nand') diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c index fc5ab2149944..f4bc86303fbe 100644 --- 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; -- cgit v1.2.3