---

yaml --- r: 195937 b: refs/heads/master c: 6f1f3d0 h: refs/heads/master i: 195935: c166d67 v: v3
git-mirror · May 10, 2010 · 4fc00e1 · 4fc00e1
1 parent 62f9d47
commit 4fc00e1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 29da3380de40e8aa908eb70fa09a54c288b0b3f4
+refs/heads/master: 6f1f3d0ab5c3eeea9f04486481c25e9afdfa26c5
diff --git a/trunk/drivers/mtd/nand/mpc5121_nfc.c b/trunk/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;
 	}