mtd: mpc5121_nfc: Changed SVR check to allow MPC5123.

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=6f1f3d0ab5c3eeea9f04486481c25e9afdfa26c5
Commit:     6f1f3d0ab5c3eeea9f04486481c25e9afdfa26c5
Parent:     29da3380de40e8aa908eb70fa09a54c288b0b3f4
Author:     Steve Deiters <SteveDeiters at BASLER.com>
AuthorDate: Wed May 5 13:48:38 2010 -0500
Committer:  David Woodhouse <David.Woodhouse at intel.com>
CommitDate: Mon May 10 14:27:16 2010 +0100

    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 at basler.com>
    Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy at nokia.com>
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
---
 drivers/mtd/nand/mpc5121_nfc.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

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;
 	}