From patchwork Tue Jun 2 17:32:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Tenart X-Patchwork-Id: 6530181 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id CFE089F1C1 for ; Tue, 2 Jun 2015 17:36:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E9AAE2049D for ; Tue, 2 Jun 2015 17:36:07 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 04EF12038E for ; Tue, 2 Jun 2015 17:36:07 +0000 (UTC) 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 1Yzq4L-0008Dx-WA; Tue, 02 Jun 2015 17:33:42 +0000 Received: from down.free-electrons.com ([37.187.137.238] helo=mail.free-electrons.com) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Yzq3c-0007ir-9Y; Tue, 02 Jun 2015 17:32:59 +0000 Received: by mail.free-electrons.com (Postfix, from userid 106) id 16B454F2; Tue, 2 Jun 2015 19:32:48 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from localhost (21.107.128.77.rev.sfr.net [77.128.107.21]) by mail.free-electrons.com (Postfix) with ESMTPSA id 9FFCC279; Tue, 2 Jun 2015 19:32:46 +0200 (CEST) From: Antoine Tenart To: sebastian.hesselbarth@gmail.com, ezequiel.garcia@free-electrons.com, dwmw2@infradead.org, computersforpeace@gmail.com Subject: [PATCH 1/7] mtd: pxa3xx_nand: add a non mandatory ECC clock Date: Tue, 2 Jun 2015 19:32:25 +0200 Message-Id: <1433266351-22587-2-git-send-email-antoine.tenart@free-electrons.com> X-Mailer: git-send-email 2.4.2 In-Reply-To: <1433266351-22587-1-git-send-email-antoine.tenart@free-electrons.com> References: <1433266351-22587-1-git-send-email-antoine.tenart@free-electrons.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150602_103256_688365_D0819582 X-CRM114-Status: GOOD ( 12.86 ) X-Spam-Score: -0.0 (/) Cc: zmxu@marvell.com, boris.brezillon@free-electrons.com, Antoine Tenart , linux-kernel@vger.kernel.org, linux-mtd@lists.infradead.org, jszhang@marvell.com, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Some controllers (as the coming Berlin nand controller) need to enable an ECC clock. Add support for this clock in the pxa3xx nand driver, and leave it as non mandatory. Signed-off-by: Antoine Tenart --- drivers/mtd/nand/pxa3xx_nand.c | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c index 42ad199ed63d..ae8a7b6b3e5c 100644 --- a/drivers/mtd/nand/pxa3xx_nand.c +++ b/drivers/mtd/nand/pxa3xx_nand.c @@ -180,7 +180,7 @@ struct pxa3xx_nand_info { struct nand_hw_control controller; struct platform_device *pdev; - struct clk *clk; + struct clk *clk, *ecc_clk; void __iomem *mmio_base; unsigned long mmio_phys; struct completion cmd_complete, dev_ready; @@ -1685,15 +1685,26 @@ static int alloc_nand_resource(struct platform_device *pdev) spin_lock_init(&chip->controller->lock); init_waitqueue_head(&chip->controller->wq); - info->clk = devm_clk_get(&pdev->dev, NULL); + info->clk = devm_clk_get(&pdev->dev, "nfc"); if (IS_ERR(info->clk)) { - dev_err(&pdev->dev, "failed to get nand clock\n"); - return PTR_ERR(info->clk); + info->clk = devm_clk_get(&pdev->dev, NULL); + + if (IS_ERR(info->clk)) { + dev_err(&pdev->dev, "failed to get nand clock\n"); + return PTR_ERR(info->clk); + } } ret = clk_prepare_enable(info->clk); if (ret < 0) return ret; + info->ecc_clk = devm_clk_get(&pdev->dev, "ecc"); + if (!IS_ERR(info->ecc_clk)) { + ret = clk_prepare_enable(info->ecc_clk); + if (ret < 0) + goto fail_disable_clk; + } + if (use_dma) { /* * This is a dirty hack to make this driver work from @@ -1710,7 +1721,7 @@ static int alloc_nand_resource(struct platform_device *pdev) dev_err(&pdev->dev, "no resource defined for data DMA\n"); ret = -ENXIO; - goto fail_disable_clk; + goto fail_disable_ecc_clk; } info->drcmr_dat = r->start; @@ -1719,7 +1730,7 @@ static int alloc_nand_resource(struct platform_device *pdev) dev_err(&pdev->dev, "no resource defined for cmd DMA\n"); ret = -ENXIO; - goto fail_disable_clk; + goto fail_disable_ecc_clk; } info->drcmr_cmd = r->start; } @@ -1729,14 +1740,14 @@ static int alloc_nand_resource(struct platform_device *pdev) if (irq < 0) { dev_err(&pdev->dev, "no IRQ resource defined\n"); ret = -ENXIO; - goto fail_disable_clk; + goto fail_disable_ecc_clk; } r = platform_get_resource(pdev, IORESOURCE_MEM, 0); info->mmio_base = devm_ioremap_resource(&pdev->dev, r); if (IS_ERR(info->mmio_base)) { ret = PTR_ERR(info->mmio_base); - goto fail_disable_clk; + goto fail_disable_ecc_clk; } info->mmio_phys = r->start; @@ -1745,7 +1756,7 @@ static int alloc_nand_resource(struct platform_device *pdev) info->data_buff = kmalloc(info->buf_size, GFP_KERNEL); if (info->data_buff == NULL) { ret = -ENOMEM; - goto fail_disable_clk; + goto fail_disable_ecc_clk; } /* initialize all interrupts to be disabled */ @@ -1766,6 +1777,8 @@ static int alloc_nand_resource(struct platform_device *pdev) fail_free_buf: free_irq(irq, info); kfree(info->data_buff); +fail_disable_ecc_clk: + clk_disable_unprepare(info->ecc_clk); fail_disable_clk: clk_disable_unprepare(info->clk); return ret; @@ -1788,6 +1801,7 @@ static int pxa3xx_nand_remove(struct platform_device *pdev) pxa3xx_nand_free_buff(info); clk_disable_unprepare(info->clk); + clk_disable_unprepare(info->ecc_clk); for (cs = 0; cs < pdata->num_cs; cs++) nand_release(info->host[cs]->mtd);