mtd: gpmi: only scan two chips for imx6

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=80bd33acdaa21fafa8ff4391ccdf879d227111bb
Commit:     80bd33acdaa21fafa8ff4391ccdf879d227111bb
Parent:     edaf4d4aad61134e820c0431cbe3d319794899f9
Author:     Huang Shijie <b32955 at freescale.com>
AuthorDate: Thu Nov 7 17:46:37 2013 +0800
Committer:  Brian Norris <computersforpeace at gmail.com>
CommitDate: Mon Nov 11 11:18:15 2013 -0800

    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 at freescale.com>
    Signed-off-by: Brian Norris <computersforpeace at gmail.com>
---
 drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
index 4b6d802..3d642b5 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;