From patchwork Sun Jun 7 13:04:22 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 28201 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 bilbo.ozlabs.org (Postfix) with ESMTPS id B7FE9B70B4 for ; Sun, 7 Jun 2009 23:10:32 +1000 (EST) Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1MDI3D-0004EK-Dy; Sun, 07 Jun 2009 13:04:39 +0000 Received: from mail-fx0-f212.google.com ([209.85.220.212]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1MDI31-0004Bx-10 for linux-mtd@lists.infradead.org; Sun, 07 Jun 2009 13:04:33 +0000 Received: by fxm8 with SMTP id 8so2684782fxm.18 for ; Sun, 07 Jun 2009 06:04:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:received:from:to:cc :subject:date:message-id:x-mailer; bh=uQk+Km4ANvCwxIgic0A5fqMOa8bjW37q24zYfPL5xeg=; b=QhKRmr3a39txpx0D+G/Op0hFWfRPmH+Fuc1Qc4wReeMUUBWahYUcWOjYSXftegSz48 OGLF6QuO2NTb/oO/h7CXkbr4eMjf32kAS0Kp+7mmoEIujQ2TOjsmb+xpK1/U92rPOYnH LKXJ0Gt7SbcmrxcRIm7akremT9uLaa+mN2sjE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer; b=sPn6HPxhUmXuI+i8eSnM5dYw8E45xMgA+nZwUhTel6ZR8qehC0YtUBXxN68P17Pee3 1G018Ss/CBp+Ix0nw+B47dLjJ29aIm1Q/21sa2c+6KANv4KCtIRjE+DQ8wOwFmdreQWZ TzZNpkuzsG2TMiiXFlo1cFM3zSZhrfGLyD0QE= Received: by 10.86.1.1 with SMTP id 1mr6044093fga.0.1244379864876; Sun, 07 Jun 2009 06:04:24 -0700 (PDT) Received: from macbook.be.48ers.dk ([88.197.161.40]) by mx.google.com with ESMTPS id e11sm4775823fga.16.2009.06.07.06.04.24 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 07 Jun 2009 06:04:24 -0700 (PDT) Received: by macbook.be.48ers.dk (Postfix, from userid 1000) id AFED4C3A20; Sun, 7 Jun 2009 15:04:23 +0200 (CEST) From: Peter Korsgaard To: ben-linux@fluff.org, David.Woodhouse@intel.com, linux-mtd@lists.infradead.org, linux-arm-kernel@lists.arm.linux.org.uk Subject: [PATCH] nand/s3c2410: s3c2410_nand_setrate(): use correct macros for 2412/2440 Date: Sun, 7 Jun 2009 15:04:22 +0200 Message-Id: <1244379863-23581-1-git-send-email-jacmet@sunsite.dk> X-Mailer: git-send-email 1.6.2 X-Spam-Score: 0.0 (/) Cc: wookey@wookware.org X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Use the correct S3C2440_NFCONF_* macros for the mask for the 2412/2440 variants instead of the 2410 ones which use wrong bit positions. Signed-off-by: Peter Korsgaard Acked-by: Ben Dooks --- drivers/mtd/nand/s3c2410.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c index 89b7905..01a105e 100644 --- a/drivers/mtd/nand/s3c2410.c +++ b/drivers/mtd/nand/s3c2410.c @@ -253,9 +253,9 @@ static int s3c2410_nand_setrate(struct s3c2410_nand_info *info) case TYPE_S3C2440: case TYPE_S3C2412: - mask = (S3C2410_NFCONF_TACLS(tacls_max - 1) | - S3C2410_NFCONF_TWRPH0(7) | - S3C2410_NFCONF_TWRPH1(7)); + mask = (S3C2440_NFCONF_TACLS(tacls_max - 1) | + S3C2440_NFCONF_TWRPH0(7) | + S3C2440_NFCONF_TWRPH1(7)); set = S3C2440_NFCONF_TACLS(tacls - 1); set |= S3C2440_NFCONF_TWRPH0(twrph0 - 1);