From patchwork Sat Apr 1 13:59:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 9657995 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 2FCFD60349 for ; Sat, 1 Apr 2017 14:00:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 27E82285C2 for ; Sat, 1 Apr 2017 14:00:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1CBBD28613; Sat, 1 Apr 2017 14:00:09 +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=ham 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 CA5AB285C2 for ; Sat, 1 Apr 2017 14:00:08 +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=Kvx+82mGT6Bm34dpaRMd2q5a0UFGfR7o4DkOE3Ixlh8=; b=jALQQnafGNHn6g7/c2q60he3pU d1ujICbzxBUx0ftO/xfzxizcr7RwJyRdFFIQ2OAOWNXG0WlJUXa3C7bJ8+lbj782e7Cr+BFGdUkUH GkrQH+MCdijPRZhfFBhrs1QVhw7qpjdQBjAvbvuvjPHTIeBAAizWHBSDtQVLNrx/v4yX6axd6utW8 GAxtkLSS50thGOBqUSGNRD5vlL4nJCMarW6CC/xLCP+v4ysWo0mfMYynOrXmdmPSuLebFdyE5ck75 uIxzvs1YJMU9j7aOiQrnRnE0iy1gXfQcgRny6hR26mHDgQlwvXlgUunxXdM2qfyOeFMQHtysyq1Hg DGXs5j9Q==; 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 1cuJZR-0008HV-Dt; Sat, 01 Apr 2017 14:00:01 +0000 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cuJZM-0008F1-Lb; Sat, 01 Apr 2017 13:59:58 +0000 Received: by mail-wm0-x244.google.com with SMTP id x75so3753722wma.1; Sat, 01 Apr 2017 06:59:37 -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=Ob1GWok18hY1PZ4p42dmObyRtbzflAXR1moxiC+8uEI=; b=by0RsKFtUsWg2jMnM2IbPIbv2++NuItHGVjytMh9ZtkP8MCvcAxzOfdSG/fu7721Y4 vM/bFZiyL5qf4FySwcYmmR5W2pTHnXlbrcaNZlvymJkpGuwZowF/fyhqzgULrdfab54s p9mUYKCJR4T03E9KO+7m2zj1MajlYRpn0sEeWIHpXGqkadohw8z2dJ1OK/xsC4lFm36H /3MxrNwPwTIu4IlFMVWpST4mTzQMNPoen5WorV5g2otOJB5pdhfajE/8dIL8PyOBnV0Z tVDGZNvsBkhYlB4A9lzC2ZGwVmElS1Y2l0O+2/xVtOHtm5C9Mqs7t33VR+Pyl6wyJHQa NMCA== 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=Ob1GWok18hY1PZ4p42dmObyRtbzflAXR1moxiC+8uEI=; b=U5qAMx67c/dNuOMhKFBA/QNbFbLLiDYFq+FdWoUGnMcrHIOWJxDSVhbiM+cpVZwYSU dHIb/FHDVXCyoHvFwXtUTe6X1AkrpvO3sKNGXKksRQ424FHk+PxDJvhcNMhNaU9oQWK5 InFvDSB0az1fuSWTGPAStHVjEKc8yVtgYdi1c1ZdTzCq3dzqbWBHl3E910jlGfjimc8E yc2nGDh8ziNQzz4wgBu5nuqu8VAztm5hBoquJ4rdW4b9lR5oGj2G2ovQaQor5UakNgLT vYh0w2V4ym+K3CqMbWsfJdfLKDbLx/trUtBGF5B1+g4Fl4bZsItSeUrlHBWh90Lo3+xE FjYA== X-Gm-Message-State: AFeK/H0YWfRVtqeesVEulmk0LWrKjD3GOfj10GG3UOB0Hjr9BWUeW4mWOKSzBq5pt+axFQ== X-Received: by 10.28.169.130 with SMTP id s124mr2393748wme.137.1491055175905; Sat, 01 Apr 2017 06:59:35 -0700 (PDT) Received: from blackbox.darklights.net (p5DE38642.dip0.t-ipconnect.de. [93.227.134.66]) by smtp.googlemail.com with ESMTPSA id b42sm10701660wra.36.2017.04.01.06.59.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 01 Apr 2017 06:59:35 -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 v2 1/2] pinctrl: meson: meson8b: fix the NAND DQS pins Date: Sat, 1 Apr 2017 15:59:21 +0200 Message-Id: <20170401135922.1288-2-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170401135922.1288-1-martin.blumenstingl@googlemail.com> References: <20170325184350.7677-1-martin.blumenstingl@googlemail.com> <20170401135922.1288-1-martin.blumenstingl@googlemail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170401_065956_893040_619699C8 X-CRM114-Status: GOOD ( 10.34 ) X-BeenThere: linux-amlogic@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-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=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. Fix this by ensuring that the GROUP() definition and the meson8b_cbus_groups use the same name for these pins. Fixes: 0fefcb6876d0 ("pinctrl: Add support for Meson8b") Signed-off-by: Martin Blumenstingl Acked-by: Kevin Hilman --- drivers/pinctrl/meson/pinctrl-meson8b.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pinctrl/meson/pinctrl-meson8b.c b/drivers/pinctrl/meson/pinctrl-meson8b.c index 76f077f18193..f87ef5a0ee6c 100644 --- a/drivers/pinctrl/meson/pinctrl-meson8b.c +++ b/drivers/pinctrl/meson/pinctrl-meson8b.c @@ -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_0", + "nand_dqs_1" }; static const char * const nor_groups[] = {