From patchwork Tue Aug 4 09:20:46 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 30712 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 ADB17B6EDF for ; Tue, 4 Aug 2009 19:26:57 +1000 (EST) Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1MYGGX-0003jY-MH; Tue, 04 Aug 2009 09:25:05 +0000 Received: from wf-out-1314.google.com ([209.85.200.173]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1MYGGR-0003Hw-FT for linux-mtd@lists.infradead.org; Tue, 04 Aug 2009 09:25:03 +0000 Received: by wf-out-1314.google.com with SMTP id 23so1289806wfg.24 for ; Tue, 04 Aug 2009 02:24:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:date:message-id :subject; bh=SqKXQchm1sBE6P3RkbGiX2Rz7ILSU580Bb3a8Nn67E0=; b=Hxqb+4cVYTc6HF9DWBJYp5P75MRQWir4cyRtbGSoARdT7S9VAbLIb+at99XqNnUWtF YSTPjcW/46+EMDxNWxHCdtVhUzpRyepGFoeGEKJnprN1F1IMtsHoM4mXz0sMLr6Oh4v6 SJmb613EDNkisUE9Jdga/TIf4esQL00C0ljNA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:date:message-id:subject; b=iVNA6FtBYEKLezgKSYzSwYt8m8UN0Gxxk+fBigJvgBlRZ5eh0qasxhhXQbupwlB6jk Emxoy6CRd4EVu3692tODCZdYysIZ9wOM30t7Q7P1t0bu24AhknDtGpwDRbdOSj/RbM1s U0bYD43JRBUc1QtEXZO2AdAUC5mwl424eGppw= Received: by 10.142.179.1 with SMTP id b1mr668539wff.295.1249377898207; Tue, 04 Aug 2009 02:24:58 -0700 (PDT) Received: from rx1.opensource.se (210.5.32.202.bf.2iij.net [202.32.5.210]) by mx.google.com with ESMTPS id 24sm1519506wfc.17.2009.08.04.02.24.55 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 04 Aug 2009 02:24:57 -0700 (PDT) From: Magnus Damm To: linux-mtd@lists.infradead.org Date: Tue, 04 Aug 2009 18:20:46 +0900 Message-Id: <20090804092046.16025.83910.sendpatchset@rx1.opensource.se> Subject: [PATCH] mtd: make onenand/generic.c more generic X-Spam-Score: 0.0 (/) Cc: linux-sh@vger.kernel.org, tony@atomide.com, Magnus Damm , kyungmin.park@samsung.com, lethal@linux-sh.org, akpm@linux-foundation.org, linux-omap@vger.kernel.org, dwmw2@infradead.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 From: Magnus Damm This patch removes the ARM dependency from the generic "onenand" platform device driver. This change makes the driver useful for other architectures as well. Needed for the SuperH kfr2r09 board. Apart from the obvious Kconfig bits, the most important change is the move away from ARM specific includes and platform data. Together with this change the only in-tree board code gets an update, and the driver name is also changed gracefully break potential out of tree drivers. The driver is also updated to allow NULL as platform data together with a few changes to make use of resource_size() and dev_name(). Signed-off-by: Magnus Damm --- Tested on the sh7724 kfr2r09 board with a separate platform data patch. arch/arm/mach-omap2/board-apollon.c | 4 ++-- drivers/mtd/onenand/Kconfig | 1 - drivers/mtd/onenand/generic.c | 24 ++++++++++++++---------- include/linux/mtd/onenand.h | 8 ++++++++ 4 files changed, 24 insertions(+), 13 deletions(-) --- 0001/arch/arm/mach-omap2/board-apollon.c +++ work/arch/arm/mach-omap2/board-apollon.c 2009-08-04 17:01:18.000000000 +0900 @@ -87,7 +87,7 @@ static struct mtd_partition apollon_part }, }; -static struct flash_platform_data apollon_flash_data = { +static struct onenand_platform_data apollon_flash_data = { .parts = apollon_partitions, .nr_parts = ARRAY_SIZE(apollon_partitions), }; @@ -99,7 +99,7 @@ static struct resource apollon_flash_res }; static struct platform_device apollon_onenand_device = { - .name = "onenand", + .name = "onenand-flash", .id = -1, .dev = { .platform_data = &apollon_flash_data, --- 0001/drivers/mtd/onenand/Kconfig +++ work/drivers/mtd/onenand/Kconfig 2009-08-04 17:01:18.000000000 +0900 @@ -23,7 +23,6 @@ config MTD_ONENAND_VERIFY_WRITE config MTD_ONENAND_GENERIC tristate "OneNAND Flash device via platform device driver" - depends on ARM help Support for OneNAND flash via platform device driver. --- 0001/drivers/mtd/onenand/generic.c +++ work/drivers/mtd/onenand/generic.c 2009-08-04 17:12:00.000000000 +0900 @@ -19,12 +19,16 @@ #include #include #include - #include -#include - -#define DRIVER_NAME "onenand" +/* + * Note: Driver name and platform data format have been updated! + * + * This version of the driver is named "onenand-flash" and takes struct + * onenand_platform_data as platform data. The old ARM-specific version + * with the name "onenand" used to take struct flash_platform_data. + */ +#define DRIVER_NAME "onenand-flash" #ifdef CONFIG_MTD_PARTITIONS static const char *part_probes[] = { "cmdlinepart", NULL, }; @@ -39,16 +43,16 @@ struct onenand_info { static int __devinit generic_onenand_probe(struct platform_device *pdev) { struct onenand_info *info; - struct flash_platform_data *pdata = pdev->dev.platform_data; + struct onenand_platform_data *pdata = pdev->dev.platform_data; struct resource *res = pdev->resource; - unsigned long size = res->end - res->start + 1; + unsigned long size = resource_size(res); int err; info = kzalloc(sizeof(struct onenand_info), GFP_KERNEL); if (!info) return -ENOMEM; - if (!request_mem_region(res->start, size, pdev->dev.driver->name)) { + if (!request_mem_region(res->start, size, dev_name(&pdev->dev))) { err = -EBUSY; goto out_free_info; } @@ -59,7 +63,7 @@ static int __devinit generic_onenand_pro goto out_release_mem_region; } - info->onenand.mmcontrol = pdata->mmcontrol; + info->onenand.mmcontrol = pdata ? pdata->mmcontrol : 0; info->onenand.irq = platform_get_irq(pdev, 0); info->mtd.name = dev_name(&pdev->dev); @@ -75,7 +79,7 @@ static int __devinit generic_onenand_pro err = parse_mtd_partitions(&info->mtd, part_probes, &info->parts, 0); if (err > 0) add_mtd_partitions(&info->mtd, info->parts, err); - else if (err <= 0 && pdata->parts) + else if (err <= 0 && pdata && pdata->parts) add_mtd_partitions(&info->mtd, pdata->parts, pdata->nr_parts); else #endif @@ -99,7 +103,7 @@ static int __devexit generic_onenand_rem { struct onenand_info *info = platform_get_drvdata(pdev); struct resource *res = pdev->resource; - unsigned long size = res->end - res->start + 1; + unsigned long size = resource_size(res); platform_set_drvdata(pdev, NULL); --- 0001/include/linux/mtd/onenand.h +++ work/include/linux/mtd/onenand.h 2009-08-04 17:01:18.000000000 +0900 @@ -214,4 +214,12 @@ unsigned onenand_block(struct onenand_ch loff_t onenand_addr(struct onenand_chip *this, int block); int flexonenand_region(struct mtd_info *mtd, loff_t addr); +struct mtd_partition; + +struct onenand_platform_data { + void (*mmcontrol)(struct mtd_info *mtd, int sync_read); + struct mtd_partition *parts; + unsigned int nr_parts; +}; + #endif /* __LINUX_MTD_ONENAND_H */