From patchwork Mon Jan 7 14:28:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1941181 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 888103FC5A for ; Mon, 7 Jan 2013 14:32:24 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TsDge-0002wZ-RA; Mon, 07 Jan 2013 14:28:25 +0000 Received: from mail-out.m-online.net ([212.18.0.10]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TsDgP-0002rL-VZ; Mon, 07 Jan 2013 14:28:16 +0000 Received: from frontend1.mail.m-online.net (frontend1.mail.intern.m-online.net [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 3YfzV02wpgz3hhy5; Mon, 7 Jan 2013 15:28:08 +0100 (CET) X-Auth-Info: N/D07DYkluB76Jc/HMUpCRu79QKphXgm8KPTsit7ijM= Received: from mashiro.lan (unknown [195.140.253.167]) by smtp-auth.mnet-online.de (Postfix) with ESMTPA id 3YfzV01506zbbsM; Mon, 7 Jan 2013 15:28:08 +0100 (CET) From: Marek Vasut To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] mtd: mxc_nand: Make use of supplied pinctrl data Date: Mon, 7 Jan 2013 15:28:05 +0100 Message-Id: <1357568885-15507-1-git-send-email-marex@denx.de> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130107_092810_994252_178A5486 X-CRM114-Status: GOOD ( 11.17 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.18.0.10 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Marek Vasut , Artem Bityutskiy , Sascha Hauer , linux-mtd@lists.infradead.org, =?UTF-8?q?Lothar=20Wa=C3=9Fmann?= X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org The MXC NAND driver doesn't consider the pinctrl data supplied via DT, which will result in NAND pins not being properly configured. Make the driver use pinctrl, but to prevent breakage on various boards, do not fail if the pinctrl data are not available, only print a warning message. Signed-off-by: Marek Vasut Cc: Artem Bityutskiy Cc: Lothar Waßmann Cc: Sascha Hauer Acked-by: Sascha Hauer --- drivers/mtd/nand/mxc_nand.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c index 45204e4..ed805fb 100644 --- a/drivers/mtd/nand/mxc_nand.c +++ b/drivers/mtd/nand/mxc_nand.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include @@ -1385,6 +1386,7 @@ static int mxcnd_probe(struct platform_device *pdev) struct mtd_info *mtd; struct mxc_nand_host *host; struct resource *res; + struct pinctrl *pinctrl; int err = 0; /* Allocate memory for MTD device structure and private data */ @@ -1449,6 +1451,10 @@ static int mxcnd_probe(struct platform_device *pdev) if (!res) return -ENODEV; + pinctrl = devm_pinctrl_get_select_default(&pdev->dev); + if (IS_ERR(pinctrl)) + dev_warn(&pdev->dev, "No PINCTRL data for the NAND driver!\n"); + host->base = devm_request_and_ioremap(&pdev->dev, res); if (!host->base) return -ENOMEM;