From patchwork Fri Sep 18 14:53:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roger Quadros X-Patchwork-Id: 53916 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f71.google.com (mail-la0-f71.google.com [209.85.215.71]) by patches.linaro.org (Postfix) with ESMTPS id 4DF94218E3 for ; Fri, 18 Sep 2015 14:59:59 +0000 (UTC) Received: by lamp12 with SMTP id p12sf18761765lam.2 for ; Fri, 18 Sep 2015 07:59:58 -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:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender:precedence :list-id:x-original-sender:x-original-authentication-results :mailing-list:list-post:list-help:list-archive:list-unsubscribe; bh=zLyJYhrn2MvdmT8GFi9snskgEM6ZRlUP1JPJJqMWmLw=; b=Q141qpcs8c+/S42UqHS62W2d9KF8EsRutRHg4rBJTwMm2mwydPR6cB5SPgbvgY2Q6l 7+HQXi/43hVjZiwfiflI7wHFdIA/vvb78ByRZJ+7iuKwzSkWmQxHouuz3G229ReNLcZB xQQADU9z0DoTi5Xgwv7d829SyRDSuXr34VeNxm6FY6PWJMuTViubNQG8DxuX5PHh1fHg w/YrABtbeEbcOtugvRDcA7wIcjSpFVKAU2hgdhY/MpTW5DFxIbawRqCLW+PCQ1mWr25q MV5wF4rYBnx7Fu92OkwjT2g+cveGwqKoJt54PK4VUT+mwoGmYLDn22tDAwrI3KLMQsit 3dZg== X-Gm-Message-State: ALoCoQnjPoJeQ3WzNgwKpVQtraDvtKqkHND6GFiCLpOe3atpQn4LQVDU3Wwgjspbk585YPbTbGg2 X-Received: by 10.152.6.201 with SMTP id d9mr997420laa.6.1442588398213; Fri, 18 Sep 2015 07:59:58 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.21.166 with SMTP id w6ls247301lae.10.gmail; Fri, 18 Sep 2015 07:59:58 -0700 (PDT) X-Received: by 10.112.218.5 with SMTP id pc5mr3236387lbc.97.1442588398077; Fri, 18 Sep 2015 07:59:58 -0700 (PDT) Received: from mail-la0-f42.google.com (mail-la0-f42.google.com. [209.85.215.42]) by mx.google.com with ESMTPS id kx10si6386398lac.76.2015.09.18.07.59.58 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Sep 2015 07:59:58 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.42 as permitted sender) client-ip=209.85.215.42; Received: by lagj9 with SMTP id j9so32541674lag.2 for ; Fri, 18 Sep 2015 07:59:57 -0700 (PDT) X-Received: by 10.112.135.9 with SMTP id po9mr3449247lbb.56.1442588397921; Fri, 18 Sep 2015 07:59:57 -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.112.59.35 with SMTP id w3csp346859lbq; Fri, 18 Sep 2015 07:59:57 -0700 (PDT) X-Received: by 10.107.13.75 with SMTP id 72mr13786065ion.75.1442588396867; Fri, 18 Sep 2015 07:59:56 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v15si7122459igd.78.2015.09.18.07.59.56; Fri, 18 Sep 2015 07:59:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754377AbbIRO7z (ORCPT + 7 others); Fri, 18 Sep 2015 10:59:55 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:39608 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752633AbbIRO4I (ORCPT ); Fri, 18 Sep 2015 10:56:08 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id t8IEtgXf000913; Fri, 18 Sep 2015 09:55:42 -0500 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id t8IEtgp8009710; Fri, 18 Sep 2015 09:55:42 -0500 Received: from dlep33.itg.ti.com (157.170.170.75) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.3.224.2; Fri, 18 Sep 2015 09:55:42 -0500 Received: from rockdesk.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id t8IEseAY002598; Fri, 18 Sep 2015 09:55:39 -0500 From: Roger Quadros To: CC: , , , , , , , , , , Roger Quadros Subject: [PATCH v3 18/27] mtd: nand: omap2: Implement NAND ready using gpiolib Date: Fri, 18 Sep 2015 17:53:40 +0300 Message-ID: <1442588029-13769-19-git-send-email-rogerq@ti.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1442588029-13769-1-git-send-email-rogerq@ti.com> References: <1442588029-13769-1-git-send-email-rogerq@ti.com> MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: devicetree@vger.kernel.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.215.42 as permitted sender) smtp.mailfrom=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 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The GPMC WAIT pin status are now available over gpiolib. Update the omap_dev_ready() function to use gpio instead of directly accessing GPMC register space. Signed-off-by: Roger Quadros --- drivers/mtd/nand/omap2.c | 29 +++++++++++++++++----------- include/linux/platform_data/mtd-nand-omap2.h | 2 +- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c index 228f498..d0f2620 100644 --- a/drivers/mtd/nand/omap2.c +++ b/drivers/mtd/nand/omap2.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -184,6 +185,8 @@ struct omap_nand_info { /* fields specific for BCHx_HW ECC scheme */ struct device *elm_dev; struct device_node *of_node; + /* NAND ready gpio */ + struct gpio_desc *ready_gpiod; }; /** @@ -1047,22 +1050,17 @@ static int omap_wait(struct mtd_info *mtd, struct nand_chip *chip) } /** - * omap_dev_ready - calls the platform specific dev_ready function + * omap_dev_ready - checks the NAND Ready GPIO line * @mtd: MTD device structure + * + * Returns true if ready and false if busy. */ static int omap_dev_ready(struct mtd_info *mtd) { - unsigned int val = 0; struct omap_nand_info *info = container_of(mtd, struct omap_nand_info, mtd); - val = readl(info->reg.gpmc_status); - - if ((val & 0x100) == 0x100) { - return 1; - } else { - return 0; - } + return gpiod_get_value(info->ready_gpiod); } /** @@ -1782,7 +1780,9 @@ static int omap_nand_probe(struct platform_device *pdev) info->reg = pdata->reg; info->of_node = pdata->of_node; info->ecc_opt = pdata->ecc_opt; - info->dev_ready = pdata->dev_ready; + if (pdata->dev_ready) + dev_info(&pdev->dev, "pdata->dev_ready is deprecated\n"); + info->xfer_type = pdata->xfer_type; info->devsize = pdata->devsize; info->elm_of_node = pdata->elm_of_node; @@ -1815,6 +1815,13 @@ 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; + info->ready_gpiod = devm_gpiod_get_optional(&pdev->dev, "ready", + GPIOD_IN); + if (IS_ERR(info->ready_gpiod)) { + dev_err(dev, "failed to get ready gpio\n"); + return PTR_ERR(info->ready_gpiod); + } + /* * If RDY/BSY line is connected to OMAP then use the omap ready * function and the generic nand_wait function which reads the status @@ -1822,7 +1829,7 @@ static int omap_nand_probe(struct platform_device *pdev) * chip delay which is slightly more than tR (AC Timing) of the NAND * device and read status register until you get a failure or success */ - if (info->dev_ready) { + if (info->ready_gpiod) { nand_chip->dev_ready = omap_dev_ready; nand_chip->chip_delay = 0; } else { diff --git a/include/linux/platform_data/mtd-nand-omap2.h b/include/linux/platform_data/mtd-nand-omap2.h index ff27e5a..19e509d 100644 --- a/include/linux/platform_data/mtd-nand-omap2.h +++ b/include/linux/platform_data/mtd-nand-omap2.h @@ -70,7 +70,6 @@ struct omap_nand_platform_data { int cs; struct mtd_partition *parts; int nr_parts; - bool dev_ready; bool flash_bbt; enum nand_io xfer_type; int devsize; @@ -81,5 +80,6 @@ struct omap_nand_platform_data { /* deprecated */ struct gpmc_nand_regs reg; struct device_node *of_node; + bool dev_ready; }; #endif