summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSteve Deiters <SteveDeiters@BASLER.com>2010-05-05 13:48:38 -0500
committerDavid Woodhouse <David.Woodhouse@intel.com>2010-05-10 14:27:16 +0100
commit6f1f3d0ab5c3eeea9f04486481c25e9afdfa26c5 (patch)
tree3266eaf3da0e185cc3eb9945d5f276c58f9084f8 /drivers
parent29da3380de40e8aa908eb70fa09a54c288b0b3f4 (diff)
downloadlinux-stable-6f1f3d0ab5c3eeea9f04486481c25e9afdfa26c5.tar.gz
linux-stable-6f1f3d0ab5c3eeea9f04486481c25e9afdfa26c5.tar.bz2
linux-stable-6f1f3d0ab5c3eeea9f04486481c25e9afdfa26c5.zip
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mtd/nand/mpc5121_nfc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/nand/mpc5121_nfc.c b/drivers/mtd/nand/mpc5121_nfc.c
index d7333f4dae86..f713b15fa454 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;
}