From patchwork Fri May 6 14:29:03 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jamie Iles X-Patchwork-Id: 94403 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 5735CB6F5A for ; Sat, 7 May 2011 00:31:28 +1000 (EST) Received: from canuck.infradead.org ([2001:4978:20e::1]) by bombadil.infradead.org with esmtps (Exim 4.72 #1 (Red Hat Linux)) id 1QIM2r-0003jW-CV; Fri, 06 May 2011 14:30:17 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.72 #1 (Red Hat Linux)) id 1QIM2p-0008TK-Nx; Fri, 06 May 2011 14:30:15 +0000 Received: from mail-ww0-f49.google.com ([74.125.82.49]) by canuck.infradead.org with esmtps (Exim 4.72 #1 (Red Hat Linux)) id 1QIM2U-0008OE-CG for linux-mtd@lists.infradead.org; Fri, 06 May 2011 14:29:55 +0000 Received: by mail-ww0-f49.google.com with SMTP id 39so2593348wwb.18 for ; Fri, 06 May 2011 07:29:54 -0700 (PDT) Received: by 10.227.1.102 with SMTP id 38mr1176548wbe.109.1304692193991; Fri, 06 May 2011 07:29:53 -0700 (PDT) Received: from localhost (cpc3-chap8-2-0-cust205.aztw.cable.virginmedia.com [94.171.253.206]) by mx.google.com with ESMTPS id ca12sm2034075wbb.36.2011.05.06.07.29.51 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 06 May 2011 07:29:53 -0700 (PDT) From: Jamie Iles To: linux-mtd@lists.infradead.org Subject: [RFC PATCH 9/9] nand/denali: support MTD partitioning Date: Fri, 6 May 2011 15:29:03 +0100 Message-Id: <1304692143-22432-10-git-send-email-jamie@jamieiles.com> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1304692143-22432-1-git-send-email-jamie@jamieiles.com> References: <1304692143-22432-1-git-send-email-jamie@jamieiles.com> X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110506_102954_664901_45E9600F X-CRM114-Status: GOOD ( 15.61 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.82.49 listed in list.dnswl.org] Cc: Jamie Iles , dwmw2@infradead.org, chuanxiao.dong@intel.com 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: , MIME-Version: 1.0 Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org If CONFIG_MTD_PARTITION is enabled then take the partitions from the platform data. Cc: David Woodhouse Cc: Chuanxiao Dong Signed-off-by: Jamie Iles --- drivers/mtd/nand/denali.c | 8 ++++++++ include/linux/platform_data/denali.h | 6 +++++- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c index c79009f..ae954de 100644 --- a/drivers/mtd/nand/denali.c +++ b/drivers/mtd/nand/denali.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -1563,7 +1564,14 @@ int denali_init(struct denali_nand_info *denali) goto failed_req_irq; } +#ifdef CONFIG_MTD_PARTITIONS + if (pdata && pdata->parts) { + ret = add_mtd_partitions(&denali->mtd, pdata->parts, + pdata->nr_parts); + } else +#endif /* CONFIG_MTD_PARTITIONS */ ret = add_mtd_device(&denali->mtd); + if (ret) { dev_err(denali->dev, "failed to register MTD: %d\n", ret); goto failed_req_irq; diff --git a/include/linux/platform_data/denali.h b/include/linux/platform_data/denali.h index cfdb775..e9e415b 100644 --- a/include/linux/platform_data/denali.h +++ b/include/linux/platform_data/denali.h @@ -14,8 +14,12 @@ #ifndef __DENALI_PDATA_H__ #define __DENALI_PDATA_H__ +struct mtd_partition; + struct denali_nand_pdata { - int nr_ecc_bits; + int nr_ecc_bits; + const struct mtd_partition *parts; + unsigned int nr_parts; }; #endif /* __DENALI_PDATA_H__ */