fsl_ifc: Support all 8 IFC chip selects

Freescale's QorIQ T Series processors support 8 IFC chip selects
within a memory map backward compatible with previous P Series
processors which supported only 4 chip selects.

Signed-off-by: Aaron Sierra <asierra@xes-inc.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

1 files changed, 4 insertions, 6 deletions

diff --git a/drivers/mtd/nand/fsl_ifc_nand.c b/drivers/mtd/nand/fsl_ifc_nand.c
index 2338124dd05f..4d40fdb24187 100644
--- a/drivers/mtd/nand/fsl_ifc_nand.c
+++ b/drivers/mtd/nand/fsl_ifc_nand.c
@@ -31,7 +31,6 @@
 #include <linux/mtd/nand_ecc.h>
 #include <linux/fsl_ifc.h>
 
-#define FSL_IFC_V1_1_0  0x01010000
 #define ERR_BYTE                0xFF /* Value returned for read
                                         bytes when read failed  */
 #define IFC_TIMEOUT_MSECS       500  /* Maximum number of mSecs to wait
@@ -877,7 +876,7 @@ static int fsl_ifc_chip_init(struct fsl_ifc_mtd *priv)
         struct fsl_ifc_regs __iomem *ifc = ctrl->regs;
         struct nand_chip *chip = &priv->chip;
         struct nand_ecclayout *layout;
-        u32 csor, ver;
+        u32 csor;
 
         /* Fill in fsl_ifc_mtd structure */
         priv->mtd.priv = chip;
@@ -984,8 +983,7 @@ static int fsl_ifc_chip_init(struct fsl_ifc_mtd *priv)
                 chip->ecc.mode = NAND_ECC_SOFT;
         }
 
-        ver = ioread32be(&ifc->ifc_rev);
-        if (ver == FSL_IFC_V1_1_0)
+        if (ctrl->version == FSL_IFC_VERSION_1_1_0)
                 fsl_ifc_sram_init(priv);
 
         return 0;
@@ -1045,12 +1043,12 @@ static int fsl_ifc_nand_probe(struct platform_device *dev)
         }
 
         /* find which chip select it is connected to */
-        for (bank = 0; bank < FSL_IFC_BANK_COUNT; bank++) {
+        for (bank = 0; bank < fsl_ifc_ctrl_dev->banks; bank++) {
                 if (match_bank(ifc, bank, res.start))
                         break;
         }
 
-        if (bank >= FSL_IFC_BANK_COUNT) {
+        if (bank >= fsl_ifc_ctrl_dev->banks) {
                 dev_err(&dev->dev, "%s: address did not match any chip selects\n",
                         __func__);
                 return -ENODEV;