From patchwork Wed Jun 11 08:56:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roger Quadros X-Patchwork-Id: 31732 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pb0-f71.google.com (mail-pb0-f71.google.com [209.85.160.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id CAEF1203C2 for ; Wed, 11 Jun 2014 08:59:43 +0000 (UTC) Received: by mail-pb0-f71.google.com with SMTP id jt11sf17835611pbb.6 for ; Wed, 11 Jun 2014 01:59:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:mime-version:cc:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list:content-type :content-transfer-encoding; bh=23LUtqPUnV2iMgAvlF6DbGkRu6loUH2s7JsgrjmKqLg=; b=WrHTxFBKILf1/lhhPkKpAbD4Y3Lv0NikOKqqiC8Phw9HqBKvg9hBzIkdTLv6j0TaJv uUaNTfWzekdv8VnACey/+AKQxSJSVXHx+xFpddVpnRPd36OHRTByhOpYasUxWKL1M9P2 2nTQ1tb9E9APZMy7u/T37IpPhf3O9yf+gOZy/M+bHet7R/0kXabtXd/gPbroBAzFY79t B7MYMddq7RYdRO9wj2NHna+32qary+1M4ebApxM1Lf9F/G3RfGi3rTYj0W+ntpwhcnLs ZsLX6RAt1l5yIeN4AL79Ed+jiF5foTRUZouHq5XWk8E5Z+J2P893+PSZqXZmirIuVZj5 kJEA== X-Gm-Message-State: ALoCoQmuv4COXvOi0xHVRanFf351H8QEMPlSHAnkUlI/ffxTcyP5grnbJYq0kFErp/yHOcIRK+4p X-Received: by 10.66.137.2 with SMTP id qe2mr4965960pab.43.1402477183117; Wed, 11 Jun 2014 01:59:43 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.40.209 with SMTP id x75ls2412977qgx.46.gmail; Wed, 11 Jun 2014 01:59:43 -0700 (PDT) X-Received: by 10.52.243.225 with SMTP id xb1mr1476631vdc.36.1402477182999; Wed, 11 Jun 2014 01:59:42 -0700 (PDT) Received: from mail-ve0-f171.google.com (mail-ve0-f171.google.com [209.85.128.171]) by mx.google.com with ESMTPS id p3si12764191vcz.34.2014.06.11.01.59.42 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 11 Jun 2014 01:59:42 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.171 as permitted sender) client-ip=209.85.128.171; Received: by mail-ve0-f171.google.com with SMTP id jz11so6186715veb.16 for ; Wed, 11 Jun 2014 01:59:42 -0700 (PDT) X-Received: by 10.58.210.68 with SMTP id ms4mr9737343vec.6.1402477182895; Wed, 11 Jun 2014 01:59:42 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.54.6 with SMTP id vs6csp286520vcb; Wed, 11 Jun 2014 01:59:42 -0700 (PDT) X-Received: by 10.140.21.239 with SMTP id 102mr47354887qgl.31.1402477182344; Wed, 11 Jun 2014 01:59:42 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id h1si30629931qaf.39.2014.06.11.01.59.42 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Jun 2014 01:59:42 -0700 (PDT) Received-SPF: none (google.com: linux-mtd-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WueLn-0001uU-J7; Wed, 11 Jun 2014 08:57:43 +0000 Received: from comal.ext.ti.com ([198.47.26.152]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WueLc-0001ee-R5; Wed, 11 Jun 2014 08:57:33 +0000 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id s5B8vAuc003472; Wed, 11 Jun 2014 03:57:10 -0500 Received: from DLEE70.ent.ti.com (dlee70.ent.ti.com [157.170.170.113]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id s5B8vAVZ020671; Wed, 11 Jun 2014 03:57:10 -0500 Received: from dflp33.itg.ti.com (10.64.6.16) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.3.174.1; Wed, 11 Jun 2014 03:57:09 -0500 Received: from localhost.localdomain (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id s5B8uiSe020510; Wed, 11 Jun 2014 03:57:06 -0500 From: Roger Quadros To: , , Subject: [PATCH 06/36] mtd: nand: omap: Move gpmc_update_nand_reg to nand driver Date: Wed, 11 Jun 2014 11:56:11 +0300 Message-ID: <1402477001-31132-7-git-send-email-rogerq@ti.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1402477001-31132-1-git-send-email-rogerq@ti.com> References: <1402477001-31132-1-git-send-email-rogerq@ti.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140611_015733_066444_24817444 X-CRM114-Status: GOOD ( 22.06 ) X-Spam-Score: -5.7 (-----) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-5.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [198.47.26.152 listed in wl.mailspike.net] -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [198.47.26.152 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Cc: devicetree@vger.kernel.org, nsekhar@ti.com, linux-kernel@vger.kernel.org, kyungmin.park@samsung.com, linux-mtd@lists.infradead.org, pekon@ti.com, ezequiel.garcia@free-electrons.com, javier@dowhile0.org, linux-omap@vger.kernel.org, Roger Quadros X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Sender: "linux-mtd" Errors-To: linux-mtd-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: rogerq@ti.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.171 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 GPMC and NAND drivers share the same register space but never use the same registers. As there is no clear address seperation between the registers for GPMC and NAND, we can't easily split it up into 2 regions i.e. one for GPMC and other for NAND. Instead, we simply remap the entire register space in both the drivers. The NAND driver doesn't re-request the region as it is already requested by the GPMC driver (parent). Signed-off-by: Roger Quadros --- arch/arm/mach-omap2/gpmc-nand.c | 16 +++- arch/arm/mach-omap2/gpmc.c | 34 +------- arch/arm/mach-omap2/gpmc.h | 5 +- drivers/mtd/nand/omap2.c | 123 ++++++++++++++++++++++++--- include/linux/platform_data/mtd-nand-omap2.h | 3 +- 5 files changed, 127 insertions(+), 54 deletions(-) diff --git a/arch/arm/mach-omap2/gpmc-nand.c b/arch/arm/mach-omap2/gpmc-nand.c index 3e6420b..aaebd2f 100644 --- a/arch/arm/mach-omap2/gpmc-nand.c +++ b/arch/arm/mach-omap2/gpmc-nand.c @@ -26,11 +26,16 @@ static struct resource gpmc_nand_resource[] = { { + /* GPMC I/O space */ .flags = IORESOURCE_MEM, }, { - .flags = IORESOURCE_IRQ, + /* GPMC register space */ + .flags = IORESOURCE_MEM, }, + { + .flags = IORESOURCE_IRQ, + } }; static struct platform_device gpmc_nand_device = { @@ -91,6 +96,7 @@ int gpmc_nand_init(struct omap_nand_platform_data *gpmc_nand_data, int err = 0; struct gpmc_settings s; struct device *dev = &gpmc_nand_device.dev; + struct resource res; memset(&s, 0, sizeof(struct gpmc_settings)); @@ -107,7 +113,11 @@ int gpmc_nand_init(struct omap_nand_platform_data *gpmc_nand_data, gpmc_nand_resource[0].end = gpmc_nand_resource[0].start + NAND_IO_SIZE - 1; - gpmc_nand_resource[1].start = gpmc_get_irq(); + gpmc_get_mem_resource(&res); + gpmc_nand_resource[1].start = res.start; + gpmc_nand_resource[1].end = res.end; + + gpmc_nand_resource[2].start = gpmc_get_irq(); if (gpmc_t) { err = gpmc_cs_set_timings(gpmc_nand_data->cs, gpmc_t); @@ -132,8 +142,6 @@ int gpmc_nand_init(struct omap_nand_platform_data *gpmc_nand_data, if (err < 0) goto out_free_cs; - gpmc_update_nand_reg(&gpmc_nand_data->reg, gpmc_nand_data->cs); - if (!gpmc_hwecc_bch_capable(gpmc_nand_data->ecc_opt)) { dev_err(dev, "Unsupported NAND ECC scheme selected\n"); return -EINVAL; diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c index 2524541..0a8b6ca 100644 --- a/arch/arm/mach-omap2/gpmc.c +++ b/arch/arm/mach-omap2/gpmc.c @@ -625,38 +625,10 @@ int gpmc_configure(int cmd, int wval) } EXPORT_SYMBOL(gpmc_configure); -void gpmc_update_nand_reg(struct gpmc_nand_regs *reg, int cs) +void gpmc_get_mem_resource(struct resource *res) { - int i; - - reg->gpmc_status = gpmc_base + GPMC_STATUS; - reg->gpmc_irqstatus = gpmc_base + GPMC_IRQSTATUS; - reg->gpmc_irqenable = gpmc_base + GPMC_IRQENABLE; - reg->gpmc_nand_command = gpmc_base + GPMC_CS0_OFFSET + - GPMC_CS_NAND_COMMAND + GPMC_CS_SIZE * cs; - reg->gpmc_nand_address = gpmc_base + GPMC_CS0_OFFSET + - GPMC_CS_NAND_ADDRESS + GPMC_CS_SIZE * cs; - reg->gpmc_nand_data = gpmc_base + GPMC_CS0_OFFSET + - GPMC_CS_NAND_DATA + GPMC_CS_SIZE * cs; - reg->gpmc_prefetch_config1 = gpmc_base + GPMC_PREFETCH_CONFIG1; - reg->gpmc_prefetch_config2 = gpmc_base + GPMC_PREFETCH_CONFIG2; - reg->gpmc_prefetch_control = gpmc_base + GPMC_PREFETCH_CONTROL; - reg->gpmc_prefetch_status = gpmc_base + GPMC_PREFETCH_STATUS; - reg->gpmc_ecc_config = gpmc_base + GPMC_ECC_CONFIG; - reg->gpmc_ecc_control = gpmc_base + GPMC_ECC_CONTROL; - reg->gpmc_ecc_size_config = gpmc_base + GPMC_ECC_SIZE_CONFIG; - reg->gpmc_ecc1_result = gpmc_base + GPMC_ECC1_RESULT; - - for (i = 0; i < GPMC_BCH_NUM_REMAINDER; i++) { - reg->gpmc_bch_result0[i] = gpmc_base + GPMC_ECC_BCH_RESULT_0 + - GPMC_BCH_SIZE * i; - reg->gpmc_bch_result1[i] = gpmc_base + GPMC_ECC_BCH_RESULT_1 + - GPMC_BCH_SIZE * i; - reg->gpmc_bch_result2[i] = gpmc_base + GPMC_ECC_BCH_RESULT_2 + - GPMC_BCH_SIZE * i; - reg->gpmc_bch_result3[i] = gpmc_base + GPMC_ECC_BCH_RESULT_3 + - GPMC_BCH_SIZE * i; - } + res->start = phys_base; + res->end = res->start + mem_size - 1; } int gpmc_get_irq(void) diff --git a/arch/arm/mach-omap2/gpmc.h b/arch/arm/mach-omap2/gpmc.h index a558ebd..479ce84 100644 --- a/arch/arm/mach-omap2/gpmc.h +++ b/arch/arm/mach-omap2/gpmc.h @@ -21,9 +21,6 @@ #define GPMC_CS_CONFIG5 0x10 #define GPMC_CS_CONFIG6 0x14 #define GPMC_CS_CONFIG7 0x18 -#define GPMC_CS_NAND_COMMAND 0x1c -#define GPMC_CS_NAND_ADDRESS 0x20 -#define GPMC_CS_NAND_DATA 0x24 /* Control Commands */ #define GPMC_CONFIG_WP 0x00000005 @@ -69,7 +66,7 @@ extern int gpmc_calc_timings(struct gpmc_timings *gpmc_t, struct gpmc_settings *gpmc_s, struct gpmc_device_timings *dev_t); -extern void gpmc_update_nand_reg(struct gpmc_nand_regs *reg, int cs); +void gpmc_get_mem_resource(struct resource *res); int gpmc_get_irq(void); extern unsigned int gpmc_ticks_to_ns(unsigned int ticks); diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c index 8de1660..120acee 100644 --- a/drivers/mtd/nand/omap2.c +++ b/drivers/mtd/nand/omap2.c @@ -140,6 +140,36 @@ #define GPMC_IRQ_FIFOEVENT BIT(0) #define GPMC_IRQ_TERMCOUNT BIT(1) +/* GPMC register offsets */ +#define GPMC_REVISION 0x00 +#define GPMC_SYSCONFIG 0x10 +#define GPMC_SYSSTATUS 0x14 +#define GPMC_IRQSTATUS 0x18 +#define GPMC_IRQENABLE 0x1c +#define GPMC_TIMEOUT_CONTROL 0x40 +#define GPMC_ERR_ADDRESS 0x44 +#define GPMC_ERR_TYPE 0x48 +#define GPMC_CONFIG 0x50 +#define GPMC_STATUS 0x54 +#define GPMC_CS_NAND_COMMAND 0x7c +#define GPMC_CS_NAND_ADDRESS 0x80 +#define GPMC_CS_NAND_DATA 0x84 +#define GPMC_PREFETCH_CONFIG1 0x1e0 +#define GPMC_PREFETCH_CONFIG2 0x1e4 +#define GPMC_PREFETCH_CONTROL 0x1ec +#define GPMC_PREFETCH_STATUS 0x1f0 +#define GPMC_ECC_CONFIG 0x1f4 +#define GPMC_ECC_CONTROL 0x1f8 +#define GPMC_ECC_SIZE_CONFIG 0x1fc +#define GPMC_ECC1_RESULT 0x200 +#define GPMC_ECC_BCH_RESULT_0 0x240 /* not available on OMAP2 */ +#define GPMC_ECC_BCH_RESULT_1 0x244 /* not available on OMAP2 */ +#define GPMC_ECC_BCH_RESULT_2 0x248 /* not available on OMAP2 */ +#define GPMC_ECC_BCH_RESULT_3 0x24c /* not available on OMAP2 */ + +#define GPMC_CS_SIZE 0x30 +#define GPMC_BCH_SIZE 0x10 + #ifdef CONFIG_MTD_NAND_OMAP_BCH static u_char bch8_vector[] = {0xf3, 0xdb, 0x14, 0x16, 0x8b, 0xd2, 0xbe, 0xcc, 0xac, 0x6b, 0xff, 0x99, 0x7b}; @@ -158,6 +188,7 @@ struct omap_nand_info { int gpmc_cs; unsigned long phys_base; + void __iomem *gpmc_base; enum omap_ecc ecc_opt; struct completion comp; struct dma_chan *dma; @@ -1584,20 +1615,58 @@ static int is_elm_present(struct omap_nand_info *info, } #endif /* CONFIG_MTD_NAND_ECC_BCH */ +static void gpmc_update_nand_reg(struct omap_nand_info *info) +{ + int i; + struct gpmc_nand_regs *reg = &info->reg; + int cs = info->gpmc_cs; + void __iomem *gpmc_base = info->gpmc_base; + + reg->gpmc_status = gpmc_base + GPMC_STATUS; + reg->gpmc_irqstatus = gpmc_base + GPMC_IRQSTATUS; + reg->gpmc_irqenable = gpmc_base + GPMC_IRQENABLE; + reg->gpmc_nand_command = gpmc_base + GPMC_CS_NAND_COMMAND + + GPMC_CS_SIZE * cs; + reg->gpmc_nand_address = gpmc_base + GPMC_CS_NAND_ADDRESS + + GPMC_CS_SIZE * cs; + reg->gpmc_nand_data = gpmc_base + GPMC_CS_NAND_DATA + + GPMC_CS_SIZE * cs; + reg->gpmc_prefetch_config1 = gpmc_base + GPMC_PREFETCH_CONFIG1; + reg->gpmc_prefetch_config2 = gpmc_base + GPMC_PREFETCH_CONFIG2; + reg->gpmc_prefetch_control = gpmc_base + GPMC_PREFETCH_CONTROL; + reg->gpmc_prefetch_status = gpmc_base + GPMC_PREFETCH_STATUS; + reg->gpmc_ecc_config = gpmc_base + GPMC_ECC_CONFIG; + reg->gpmc_ecc_control = gpmc_base + GPMC_ECC_CONTROL; + reg->gpmc_ecc_size_config = gpmc_base + GPMC_ECC_SIZE_CONFIG; + reg->gpmc_ecc1_result = gpmc_base + GPMC_ECC1_RESULT; + + for (i = 0; i < GPMC_BCH_NUM_REMAINDER; i++) { + reg->gpmc_bch_result0[i] = gpmc_base + GPMC_ECC_BCH_RESULT_0 + + GPMC_BCH_SIZE * i; + reg->gpmc_bch_result1[i] = gpmc_base + GPMC_ECC_BCH_RESULT_1 + + GPMC_BCH_SIZE * i; + reg->gpmc_bch_result2[i] = gpmc_base + GPMC_ECC_BCH_RESULT_2 + + GPMC_BCH_SIZE * i; + reg->gpmc_bch_result3[i] = gpmc_base + GPMC_ECC_BCH_RESULT_3 + + GPMC_BCH_SIZE * i; + } +} + static int omap_nand_probe(struct platform_device *pdev) { - struct omap_nand_info *info; - struct omap_nand_platform_data *pdata; - struct mtd_info *mtd; - struct nand_chip *nand_chip; - struct nand_ecclayout *ecclayout; - int err; - int i; - dma_cap_mask_t mask; - unsigned sig; - unsigned oob_index; - struct resource *res; - struct mtd_part_parser_data ppdata = {}; + struct omap_nand_info *info; + struct omap_nand_platform_data *pdata; + struct mtd_info *mtd; + struct nand_chip *nand_chip; + struct nand_ecclayout *ecclayout; + int err; + int i; + dma_cap_mask_t mask; + unsigned sig; + unsigned oob_index; + struct resource *res; + struct mtd_part_parser_data ppdata = {}; + struct device *dev = &pdev->dev; pdata = dev_get_platdata(&pdev->dev); if (pdata == NULL) { @@ -1617,7 +1686,6 @@ static int omap_nand_probe(struct platform_device *pdev) info->pdev = pdev; info->gpmc_cs = pdata->cs; - info->reg = pdata->reg; info->of_node = pdata->of_node; info->ecc_opt = pdata->ecc_opt; mtd = &info->mtd; @@ -1628,8 +1696,14 @@ static int omap_nand_probe(struct platform_device *pdev) nand_chip->ecc.priv = NULL; nand_chip->options |= NAND_SKIP_BBTSCAN; + /* GPMC external I/O space */ res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - nand_chip->IO_ADDR_R = devm_ioremap_resource(&pdev->dev, res); + if (!res) { + dev_err(dev, "Can't get memory resource 0\n"); + return -EINVAL; + } + + nand_chip->IO_ADDR_R = devm_ioremap_resource(dev, res); if (IS_ERR(nand_chip->IO_ADDR_R)) return PTR_ERR(nand_chip->IO_ADDR_R); @@ -1640,6 +1714,27 @@ static int omap_nand_probe(struct platform_device *pdev) nand_chip->IO_ADDR_W = nand_chip->IO_ADDR_R; nand_chip->cmd_ctrl = omap_hwcontrol; + /* GPMC internal registers */ + res = platform_get_resource(pdev, IORESOURCE_MEM, 1); + if (!res) { + dev_err(dev, "Can't get memory resource 1\n"); + return -EINVAL; + } + + /* + * This resource is already requested by the GPMC driver + * so we can't request it again. Instead, we just ioremap it. + * This driver doesn't access the same registers as the GPMC + * driver so it is safe. + */ + info->gpmc_base = devm_ioremap(dev, res->start, resource_size(res)); + if (!info->gpmc_base) { + dev_err(dev, "Can't ioremap resource 1\n"); + return -EADDRNOTAVAIL; + } + + gpmc_update_nand_reg(info); + /* * If RDY/BSY line is connected to OMAP then use the omap ready * function and the generic nand_wait function which reads the status diff --git a/include/linux/platform_data/mtd-nand-omap2.h b/include/linux/platform_data/mtd-nand-omap2.h index 97c9852..b71cfbdb6 100644 --- a/include/linux/platform_data/mtd-nand-omap2.h +++ b/include/linux/platform_data/mtd-nand-omap2.h @@ -62,10 +62,11 @@ struct omap_nand_platform_data { enum nand_io xfer_type; int devsize; enum omap_ecc ecc_opt; - struct gpmc_nand_regs reg; /* for passing the partitions */ struct device_node *of_node; struct device_node *elm_of_node; + + struct gpmc_nand_regs reg; /* deprecated */ }; #endif