From patchwork Sun Jun 7 13:04:23 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 28219 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 B3453B70A4 for ; Mon, 8 Jun 2009 15:49:16 +1000 (EST) Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1MDXh0-0006KC-AS; Mon, 08 Jun 2009 05:46:46 +0000 Received: from fg-out-1718.google.com ([72.14.220.154]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1MDI31-0004C1-7y for linux-mtd@lists.infradead.org; Sun, 07 Jun 2009 13:04:40 +0000 Received: by fg-out-1718.google.com with SMTP id e21so907254fga.3 for ; Sun, 07 Jun 2009 06:04:25 -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:in-reply-to:references; bh=7teLdvuCqUdHuBKI/BKxZesQP0s+xmxHCIo1u/dDQLU=; b=N29rwPM6xz4DTp8Qd+WTp8w1f+yynr1zBadLyOaQxBIm4SzJ+3q3eWlE3sO+PnSksB /j4lw9bAbZ8n4O5Y0tlbE7BCJWymOOPwwOiR9BTALoF0gjXdenIwYuxhwrp+T/9b+6U3 YjM16ByeyznDU0IP211wS6VV+j8JoM6q7+HPw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; b=eRJQZdgedc5r8Mt8CrP+DlCeIjH06lTc/s1XuGIGU4GuazgZPnw8LCuuUfJo0LTL9Y DFMhI7ITy4jrWe3BS7YmiagEirEfatTIM+KcHwU6NCi/+8B+pw+MY8BsyOqJozjeQyIG 77QMedw6t972xo8KzCPiD+6FYwHwqG4ZVeb20= Received: by 10.86.23.20 with SMTP id 20mr6006640fgw.49.1244379865192; Sun, 07 Jun 2009 06:04:25 -0700 (PDT) Received: from macbook.be.48ers.dk ([88.197.161.40]) by mx.google.com with ESMTPS id 3sm555541fge.14.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 BC73EC3A1E; 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] mtd/nand: s3c6400 support for s3c2410 driver Date: Sun, 7 Jun 2009 15:04:23 +0200 Message-Id: <1244379863-23581-2-git-send-email-jacmet@sunsite.dk> X-Mailer: git-send-email 1.6.2 In-Reply-To: <1244379863-23581-1-git-send-email-jacmet@sunsite.dk> References: <1244379863-23581-1-git-send-email-jacmet@sunsite.dk> X-Bad-Reply: References and In-Reply-To but no 'Re:' in Subject. X-Spam-Score: 0.0 (/) X-Mailman-Approved-At: Mon, 08 Jun 2009 01:46:43 -0400 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 Add s3c6400 support to the s3c2410 driver. The nand controller in the s3c64xx devices is compatible with the one in the s3c2412, so simply reuse that code. Signed-off-by: Peter Korsgaard Acked-by: Ben Dooks --- drivers/mtd/nand/Kconfig | 18 +++++++++--------- drivers/mtd/nand/s3c2410.c | 3 +++ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig index 890936d..4d63d7b 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig @@ -139,27 +139,27 @@ config MTD_NAND_PPCHAMELEONEVB This enables the NAND flash driver on the PPChameleon EVB Board. config MTD_NAND_S3C2410 - tristate "NAND Flash support for S3C2410/S3C2440 SoC" - depends on ARCH_S3C2410 + tristate "NAND Flash support for Samsung S3C SoCs" + depends on ARCH_S3C2410 || ARCH_S3C64XX help - This enables the NAND flash controller on the S3C2410 and S3C2440 + This enables the NAND flash controller on the S3C24xx and S3C64xx SoCs No board specific support is done by this driver, each board must advertise a platform_device for the driver to attach. config MTD_NAND_S3C2410_DEBUG - bool "S3C2410 NAND driver debug" + bool "Samsung S3C NAND driver debug" depends on MTD_NAND_S3C2410 help - Enable debugging of the S3C2410 NAND driver + Enable debugging of the S3C NAND driver config MTD_NAND_S3C2410_HWECC - bool "S3C2410 NAND Hardware ECC" + bool "Samsung S3C NAND Hardware ECC" depends on MTD_NAND_S3C2410 help - Enable the use of the S3C2410's internal ECC generator when - using NAND. Early versions of the chip have had problems with + Enable the use of the controller's internal ECC generator when + using NAND. Early versions of the chips have had problems with incorrect ECC generation, and if using these, the default of software ECC is preferable. @@ -171,7 +171,7 @@ config MTD_NAND_NDFC NDFC Nand Flash Controllers are integrated in IBM/AMCC's 4xx SoCs config MTD_NAND_S3C2410_CLKSTOP - bool "S3C2410 NAND IDLE clock stop" + bool "Samsung S3C NAND IDLE clock stop" depends on MTD_NAND_S3C2410 default n help diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c index 01a105e..11dc7e6 100644 --- a/drivers/mtd/nand/s3c2410.c +++ b/drivers/mtd/nand/s3c2410.c @@ -1111,6 +1111,9 @@ static struct platform_device_id s3c24xx_driver_ids[] = { }, { .name = "s3c2412-nand", .driver_data = TYPE_S3C2412, + }, { + .name = "s3c6400-nand", + .driver_data = TYPE_S3C2412, /* compatible with 2412 */ }, { } };