From patchwork Wed Apr 28 22:33:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Deiters X-Patchwork-Id: 51256 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [18.85.46.34]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C36D7B7D5D for ; Thu, 29 Apr 2010 08:34:58 +1000 (EST) Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1O7Fon-0001Re-Vh; Wed, 28 Apr 2010 22:33:21 +0000 Received: from tethra.basler.com ([206.107.254.19]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1O7Fol-0001Qk-LU for linux-mtd@lists.infradead.org; Wed, 28 Apr 2010 22:33:20 +0000 Received: from exchserver.basler.com (unknown [192.168.1.5]) by tethra.basler.com (Postfix) with ESMTP id 1F6F12433; Wed, 28 Apr 2010 17:33:17 -0500 (CDT) X-MIMEOLE: Produced By Microsoft Exchange V6.5 Content-class: urn:content-classes:message MIME-Version: 1.0 Subject: [PATCH] mpc5121_nfc: Changed SVR check to allow MPC5123. Date: Wed, 28 Apr 2010 17:33:19 -0500 Message-ID: <181804936ABC2349BE503168465576460E95836C@exchserver.basler.com> X-MS-Has-Attach: X-MS-TNEF-Correlator: Thread-Topic: [PATCH] mpc5121_nfc: Changed SVR check to allow MPC5123. Thread-index: AcrnIs2T/sA03MJXRTaDY4oq+I/6EQ== From: "Steve Deiters" To: , X-BaslerElectric-MailScanner-Information: Please contact the ISP for more information X-BaslerElectric-MailScanner-ID: 1F6F12433.A84D9 X-BaslerElectric-MailScanner: Found to be clean X-BaslerElectric-MailScanner-SpamCheck: not spam, SpamAssassin (not cached, score=-4.399, required 4, autolearn=not spam, ALL_TRUSTED -1.80, BAYES_00 -2.60) X-BaslerElectric-MailScanner-From: stevedeiters@basler.com X-BaslerElectric-MailScanner-To: linux-mtd@lists.infradead.org, linuxppc-dev@lists.ozlabs.org X-Spam-Status: No X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20100428_183319_802228_DCE86F65 X-CRM114-Status: UNSURE ( 7.51 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.3.1 on bombadil.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org The revision in SVR for MPC5123 is 3. The NFC is the same as MPC5121 revision 2. --- drivers/mtd/nand/mpc5121_nfc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) return -ENXIO; } 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);