From patchwork Sat Mar 25 18:43:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 9644797 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A712260327 for ; Sat, 25 Mar 2017 18:44:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 941F022638 for ; Sat, 25 Mar 2017 18:44:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 891C127FAC; Sat, 25 Mar 2017 18:44:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4AB1322638 for ; Sat, 25 Mar 2017 18:44:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=R+451w+vtluPQFG+QZUI136VPYN2ql5rqFSTcfgGOSw=; b=Uqdz6er0lXcnj/TmNCF2VsKyIE 452mfpQYL6+8l9fxR4d73qLNxVQNtIPHvX6e6n1JVeg8SDLXwIZvFHBkTAW0WfZEpSK4amB3jVF9a Moy1l9PoS3AWKtPe3d8uTv4+ndvLcAG2I3ucELj7UWIDTbdAd4B5vn1gGry1NLqv9eAF0kHLzmFod xmBBpuXGmL5NT6YUS7Kd3D57Gposf8XMPNyh66P5DtEjTyazhb3pRkxtGF0cQR9KsM0vXpRk6eEeW NB76YbVdcu0lKilHPpLGovHDwY5K/a2ckP0gQjn/2M13cenhqGhJp3BpihEMNKUkLmafFiwW/HuZW G9Fwn9aA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1crqfv-00087O-Re; Sat, 25 Mar 2017 18:44:31 +0000 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1crqfp-0007mU-Il; Sat, 25 Mar 2017 18:44:28 +0000 Received: by mail-wm0-x243.google.com with SMTP id n11so3832505wma.0; Sat, 25 Mar 2017 11:44:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=4S1IpRo6BAFp7ttOJ3OFsLrXAuGuIh33GltDDu7BcAc=; b=Nm/RhA82HIszpY5Y1bf7h0xux3X4mV5++V1RhQLg9k++IidgC66Pf1GKGonDtz8bZI GQJk98M1xcYyanDC7xWrDqczB/jiMO6rkqkW45kpqzlK1zN1CHDre384Q2Yt5v+/SQHM QEA6zXkoxaeFn28ZI6N5uhdkaX18GTqW1cAtS7DPNQWIB07ItKc8WkwQz2RxQsTeVf5C uk7NmDdAeUtHvT6uLoUoEMnG2zc+0YnLJdGMkbyY23Z6onGGwBphF1opFbMW10Gq8J3c n+Dohzz9b6GIhx4GiJ/BKd7nCIs1WpTlEkgW09g70+P/KaRKK4oXKc1zucPftNjM7mtH 1urA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=4S1IpRo6BAFp7ttOJ3OFsLrXAuGuIh33GltDDu7BcAc=; b=o4hNj5qtRHb96FFubR0VSWa9rn/jR2zADFdpNVAe4vo7iDE6eYdHSS+1irdRDtSe8o xPbdYsSKIzMnfJhvc3iViX+fjoyRCvd6DSwUbdaO8X5+eWNsHRi5eBqWxaDTEOKzn1UP tF1MIkv/3sTF1u/3ppfYV78ig1ghybImvL5KP7tV5L1w06ZEAoV3Biv59VM30pSqBnig /8Lzl2mfysGfNtp7bZ9mxPT82MKqyvuksL7PIwofL4MOjbvCUlr574zhbfbX3nZ2CSMQ bS+azvBMtZ/bS2+r36XkgdBBONYr//RQl6sF4ivbV+vVlZbZjCEboaCCx1/xY455fAgV ZowQ== X-Gm-Message-State: AFeK/H2Hwc3a8OaY59etUb2ekofL2sQffBxBqoR8v4l7dVzsjpcoJW/MhEGTLliXULoV9A== X-Received: by 10.28.15.12 with SMTP id 12mr2875801wmp.22.1490467444116; Sat, 25 Mar 2017 11:44:04 -0700 (PDT) Received: from blackbox.darklights.net (p5DE38642.dip0.t-ipconnect.de. [93.227.134.66]) by smtp.googlemail.com with ESMTPSA id l21sm7921595wrl.59.2017.03.25.11.44.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 25 Mar 2017 11:44:03 -0700 (PDT) From: Martin Blumenstingl To: linux-amlogic@lists.infradead.org, linux-gpio@vger.kernel.org, khilman@baylibre.com, carlo@caione.org, linus.walleij@linaro.org Subject: [PATCH 1/1] pinctrl: meson: meson8b: fix the NAND DQS pins Date: Sat, 25 Mar 2017 19:43:50 +0100 Message-Id: <20170325184350.7677-2-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170325184350.7677-1-martin.blumenstingl@googlemail.com> References: <20170325184350.7677-1-martin.blumenstingl@googlemail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170325_114425_783353_C970B3A5 X-CRM114-Status: GOOD ( 10.08 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Martin Blumenstingl , linux-arm-kernel@lists.infradead.org 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 The nand_groups table uses different names for the NAND DQS pins than the GROUP() definition in meson8b_cbus_groups (nand_dqs_0 vs nand_dqs0). This prevents using the NAND DQS pins in the devicetree. I decided to rename both pins to nand_dqs_15 and nand_dqs_18 as both seem to serve the same function, just exposed on different pins (unlike the ethernet TX pins for example, where there's eth_txd0..3 - all of these can be active at the same time as they are different data lines). Fixes: 0fefcb6876d0 ("pinctrl: Add support for Meson8b") Signed-off-by: Martin Blumenstingl --- drivers/pinctrl/meson/pinctrl-meson8b.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/pinctrl/meson/pinctrl-meson8b.c b/drivers/pinctrl/meson/pinctrl-meson8b.c index 76f077f18193..bf747eb1f3f4 100644 --- a/drivers/pinctrl/meson/pinctrl-meson8b.c +++ b/drivers/pinctrl/meson/pinctrl-meson8b.c @@ -267,8 +267,8 @@ static const unsigned int nand_ale_pins[] = { PIN(BOOT_11, 0) }; static const unsigned int nand_cle_pins[] = { PIN(BOOT_12, 0) }; static const unsigned int nand_wen_clk_pins[] = { PIN(BOOT_13, 0) }; static const unsigned int nand_ren_clk_pins[] = { PIN(BOOT_14, 0) }; -static const unsigned int nand_dqs_0_pins[] = { PIN(BOOT_15, 0) }; -static const unsigned int nand_dqs_1_pins[] = { PIN(BOOT_18, 0) }; +static const unsigned int nand_dqs_15_pins[] = { PIN(BOOT_15, 0) }; +static const unsigned int nand_dqs_18_pins[] = { PIN(BOOT_18, 0) }; static const unsigned int sdxc_d0_c_pins[] = { PIN(BOOT_0, 0)}; static const unsigned int sdxc_d13_c_pins[] = { PIN(BOOT_1, 0), PIN(BOOT_2, 0), @@ -527,8 +527,8 @@ static struct meson_pmx_group meson8b_cbus_groups[] = { GROUP(nand_cle, 2, 20), GROUP(nand_wen_clk, 2, 19), GROUP(nand_ren_clk, 2, 18), - GROUP(nand_dqs_0, 2, 27), - GROUP(nand_dqs_1, 2, 28), + GROUP(nand_dqs_15, 2, 27), + GROUP(nand_dqs_18, 2, 28), GROUP(sdxc_d0_c, 4, 30), GROUP(sdxc_d13_c, 4, 29), GROUP(sdxc_d47_c, 4, 28), @@ -739,8 +739,8 @@ static const char * const sdxc_c_groups[] = { static const char * const nand_groups[] = { "nand_io", "nand_io_ce0", "nand_io_ce1", "nand_io_rb0", "nand_ale", "nand_cle", - "nand_wen_clk", "nand_ren_clk", "nand_dqs0", - "nand_dqs1" + "nand_wen_clk", "nand_ren_clk", "nand_dqs_15", + "nand_dqs_18" }; static const char * const nor_groups[] = {