From patchwork Wed Apr 22 07:41:57 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alessandro Rubini X-Patchwork-Id: 26300 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 0FC3AB7063 for ; Wed, 22 Apr 2009 17:50:29 +1000 (EST) Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1LwXA0-0001Kz-9Q; Wed, 22 Apr 2009 07:46:24 +0000 Received: from mail2.gnudd.com ([213.203.150.91] helo=mail.gnudd.com) by bombadil.infradead.org with esmtps (Exim 4.69 #1 (Red Hat Linux)) id 1LwX65-00028e-GL for linux-mtd@lists.infradead.org; Wed, 22 Apr 2009 07:42:28 +0000 Received: from mail.gnudd.com (localhost [127.0.0.1]) by mail.gnudd.com (8.13.8/8.13.8/Debian-3) with ESMTP id n3M7fvAu032069; Wed, 22 Apr 2009 09:41:57 +0200 Received: (from rubini@localhost) by mail.gnudd.com (8.13.8/8.13.8/Submit) id n3M7fvee032068; Wed, 22 Apr 2009 09:41:57 +0200 Date: Wed, 22 Apr 2009 09:41:57 +0200 From: Alessandro Rubini To: linux-arm-kernel@lists.arm.linux.org.uk Subject: [PATCH 5/6] OneNand driver for Nomadik 8815 SoC (on NHK8815 board) Message-ID: Mail-Followup-To: Alessandro Rubini , linux-arm-kernel@lists.arm.linux.org.uk, andrea.gallo@stericsson.com, STEricsson_nomadik_linux@list.st.com, linux-mtd@lists.infradead.org MIME-Version: 1.0 Content-Disposition: inline X-Face: #Q; A)@_4.#>0+_%y]7aBr:c"ndLp&#+2?]J; lkse\^)FP^Lr5@O0{)J; 'nny4%74.fM'n)M >ISCj.KmsL/HTxz!:Ju'pnj'Gz&. Organization: GnuDD, Device Drivers, Embedded Systems, Courses In-Reply-To: References: X-Bad-Reply: References and In-Reply-To but no 'Re:' in Subject. X-Spam-Score: 0.0 (/) X-Mailman-Approved-At: Wed, 22 Apr 2009 03:46:15 -0400 Cc: STEricsson_nomadik_linux@list.st.com, linux-mtd@lists.infradead.org, andrea.gallo@stericsson.com 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: , Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Alessandro Rubini Add the platform_device and the configuration used to activate the OneNand device found on the NHK8815 evaluation kit. Signed-off-by: Alessandro Rubini Acked-by: Andrea Gallo --- This and one-nand are Cc: to the mtd list, the other patches have been sent only to linux-arm-kernel. arch/arm/configs/nhk15_defconfig | 9 +++- arch/arm/mach-nomadik/board-8815nhk.c | 67 +++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 2 deletions(-) diff --git a/arch/arm/configs/nhk15_defconfig b/arch/arm/configs/nhk15_defconfig index 1697efe..ea99b34 100644 --- a/arch/arm/configs/nhk15_defconfig +++ b/arch/arm/configs/nhk15_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.29-rc7 -# Thu Mar 12 00:30:32 2009 +# Fri Mar 13 00:06:15 2009 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -477,7 +477,12 @@ CONFIG_MTD_NAND_IDS=y # CONFIG_MTD_NAND_NANDSIM is not set # CONFIG_MTD_NAND_PLATFORM is not set CONFIG_MTD_NAND_NOMADIK=y -# CONFIG_MTD_ONENAND is not set +CONFIG_MTD_ONENAND=y +CONFIG_MTD_ONENAND_VERIFY_WRITE=y +CONFIG_MTD_ONENAND_GENERIC=y +# CONFIG_MTD_ONENAND_OTP is not set +# CONFIG_MTD_ONENAND_2X_PROGRAM is not set +# CONFIG_MTD_ONENAND_SIM is not set # # LPDDR flash memory drivers diff --git a/arch/arm/mach-nomadik/board-8815nhk.c b/arch/arm/mach-nomadik/board-8815nhk.c index b7be6c2..0cd2dcb 100644 --- a/arch/arm/mach-nomadik/board-8815nhk.c +++ b/arch/arm/mach-nomadik/board-8815nhk.c @@ -27,6 +27,7 @@ #include #include +#include #include #include #include @@ -120,6 +121,70 @@ static struct platform_device nhk8815_nand_device = { .num_resources = ARRAY_SIZE(nhk8815_nand_resources), }; +/* These are the partitions for the OneNand device, different from above */ +static struct mtd_partition nhk8815_onenand_partitions[] = { + { + .name = "X-Loader(OneNAND)", + .offset = 0, + .size = SZ_256K, + }, { + .name = "MemInit(OneNAND)", + .offset = MTDPART_OFS_APPEND, + .size = SZ_256K, + }, { + .name = "BootLoader(OneNAND)", + .offset = MTDPART_OFS_APPEND, + .size = SZ_2M-SZ_256K, + }, { + .name = "U-Boot Environment(OneNAND)", + .offset = MTDPART_OFS_APPEND, + .size = SZ_256K, + }, { + .name = "SysImage(OneNAND)", + .offset = MTDPART_OFS_APPEND, + .size = 4 * SZ_1M, + }, { + .name = "Root Filesystem(OneNAND)", + .offset = MTDPART_OFS_APPEND, + .size = 22 * SZ_1M, + }, { + .name = "User Filesystem(OneNAND)", + .offset = MTDPART_OFS_APPEND, + .size = MTDPART_SIZ_FULL, + } +}; + +static struct flash_platform_data nhk8815_onenand_data = { + .parts = nhk8815_onenand_partitions, + .nr_parts = ARRAY_SIZE(nhk8815_onenand_partitions), +}; + +static struct resource nhk8815_onenand_resource[] = { + { + .start = 0x30000000, + .end = 0x30000000 + SZ_128K - 1, + .flags = IORESOURCE_MEM, + }, +}; + +static struct platform_device nhk8815_onenand_device = { + .name = "onenand", + .id = -1, + .dev = { + .platform_data = &nhk8815_onenand_data, + }, + .resource = nhk8815_onenand_resource, + .num_resources = ARRAY_SIZE(nhk8815_onenand_resource), +}; + +static void __init nhk8815_onenand_init(void) +{ +#ifdef CONFIG_ONENAND + /* Set up SMCS0 for OneNand */ + writel(0x000030db, FSMC_BCR0); + writel(0x02100551, FSMC_BTR0); +#endif +} #define __MEM_4K_RESOURCE(x) \ .res = {.start = (x), .end = (x) + SZ_4K - 1, .flags = IORESOURCE_MEM} @@ -159,6 +224,7 @@ arch_initcall(nhk8815_init); static struct platform_device *nhk8815_platform_devices[] __initdata = { &nhk8815_nand_device, + &nhk8815_onenand_device, /* will add keypad, touchscreen etc */ }; @@ -170,6 +236,7 @@ static void __init nhk8815_map_io(void) static void __init nhk8815_platform_init(void) { cpu8815_platform_init(); + nhk8815_onenand_init(); platform_add_devices(nhk8815_platform_devices, ARRAY_SIZE(nhk8815_platform_devices)); }