Patchwork [resend] mpc5121_nfc: Changed SVR check to allow MPC5123.

login
register
mail settings
Submitter Steve Deiters
Date May 5, 2010, 6:48 p.m.
Message ID <181804936ABC2349BE503168465576460EA16F75@exchserver.basler.com>
Download mbox | patch
Permalink /patch/51723/
State New
Headers show

Comments

Steve Deiters - May 5, 2010, 6:48 p.m.
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>
---
 drivers/mtd/nand/mpc5121_nfc.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

 		return -ENXIO;
 	}
Artem Bityutskiy - May 6, 2010, 6:42 a.m.
On Wed, 2010-05-05 at 13:48 -0500, Steve Deiters wrote:
> 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>
> ---
>  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 191bf99..dc04d74 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;
>  	}

Now your patch is line-wrapped. But I fixed it and pushed to
l2-mtd-2.6.git / master.

Patch

diff --git a/drivers/mtd/nand/mpc5121_nfc.c
b/drivers/mtd/nand/mpc5121_nfc.c
index 191bf99..dc04d74 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);