From: Steve Deiters <SteveDeiters@BASLER.com>
Date: Wed, 5 May 2010 18:48:38 +0000 (-0500)
Subject: mtd: mpc5121_nfc: Changed SVR check to allow MPC5123.
X-Git-Tag: v3.12-rc1~10270^2~53
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6f1f3d0ab5c3eeea9f04486481c25e9afdfa26c5;p=kernel%2Fkernel-generic.git

mtd: mpc5121_nfc: Changed SVR check to allow MPC5123.

The revision in SVR for MPC5123 is 3.  The NFC is the same as MPC5121
revision 2.

Signed-off-by: Steve Deiters <SteveDeiters@basler.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
---

diff --git a/drivers/mtd/nand/mpc5121_nfc.c b/drivers/mtd/nand/mpc5121_nfc.c
index d7333f4..f713b15 100644
--- a/drivers/mtd/nand/mpc5121_nfc.c
+++ b/drivers/mtd/nand/mpc5121_nfc.c
@@ -666,10 +666,10 @@ static int __devinit mpc5121_nfc_probe(struct of_device *op,
 
 	/*
 	 * Check SoC revision. This driver supports only NFC
-	 * in MPC5121 revision 2.
+	 * in MPC5121 revision 2 and MPC5123 revision 3.
 	 */
 	rev = (mfspr(SPRN_SVR) >> 4) & 0xF;
-	if (rev != 2) {
+	if ((rev != 2) && (rev != 3)) {
 		dev_err(dev, "SoC revision %u is not supported!\n", rev);
 		return -ENXIO;
 	}