From 4fc00e11743ee1d469ba9e52a0c0328f31ce776f Mon Sep 17 00:00:00 2001 From: Steve Deiters Date: Wed, 5 May 2010 13:48:38 -0500 Subject: [PATCH] --- yaml --- r: 195937 b: refs/heads/master c: 6f1f3d0ab5c3eeea9f04486481c25e9afdfa26c5 h: refs/heads/master i: 195935: c166d6765bb19f7bf93cf42d99968652a101b153 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/mpc5121_nfc.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 41dcb32cc476..04fa398a1ad8 100644 --- 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 index d7333f4dae86..f713b15fa454 100644 --- 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; }