summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHuang Shijie <b32955@freescale.com>2013-11-07 17:46:37 +0800
committerBrian Norris <computersforpeace@gmail.com>2013-11-11 11:18:15 -0800
commit80bd33acdaa21fafa8ff4391ccdf879d227111bb (patch)
tree1cd3ecb9ab668d3cfe6467db1d895e4c5c4214f4
parentedaf4d4aad61134e820c0431cbe3d319794899f9 (diff)
downloadlinux-stable-80bd33acdaa21fafa8ff4391ccdf879d227111bb.tar.gz
linux-stable-80bd33acdaa21fafa8ff4391ccdf879d227111bb.tar.bz2
linux-stable-80bd33acdaa21fafa8ff4391ccdf879d227111bb.zip
mtd: gpmi: only scan two chips for imx6
We cannot scan two chips for imx23 and imx28: imx23: the Ready-Busy1 line is not connected for some board. imx28: we do not set the pinctrl for Ready-Busy1 So we only scan two chips for imx6. Signed-off-by: Huang Shijie <b32955@freescale.com> Signed-off-by: Brian Norris <computersforpeace@gmail.com>
-rw-r--r--drivers/mtd/nand/gpmi-nand/gpmi-nand.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
index 4b6d802018fb..3d642b5c3a79 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
@@ -1674,7 +1674,7 @@ static int gpmi_nfc_init(struct gpmi_nand_data *this)
if (ret)
goto err_out;
- ret = nand_scan_ident(mtd, 2, NULL);
+ ret = nand_scan_ident(mtd, GPMI_IS_MX6Q(this) ? 2 : 1, NULL);
if (ret)
goto err_out;