linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Martin Blumenstingl <martin.blumenstingl@googlemail.com>,
	Linus Walleij <linus.walleij@linaro.org>,
	Sasha Levin <sashal@kernel.org>,
	linux-gpio@vger.kernel.org, linux-amlogic@lists.infradead.org
Subject: [PATCH AUTOSEL 4.9 06/24] pinctrl: meson: meson8b: fix the sdxc_a data 1..3 pins
Date: Wed, 13 Mar 2019 15:16:29 -0400	[thread overview]
Message-ID: <20190313191647.160171-6-sashal@kernel.org> (raw)
In-Reply-To: <20190313191647.160171-1-sashal@kernel.org>

From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>

[ Upstream commit c17abcfa93bf0be5e48bb011607d237ac2bfc839 ]

Fix the mismatch between the "sdxc_d13_1_a" pin group definition from
meson8b_cbus_groups and the entry in sdxc_a_groups ("sdxc_d0_13_1_a").
This makes it possible to use "sdxc_d13_1_a" in device-tree files to
route the MMC data 1..3 pins to GPIOX_1..3.

Fixes: 0fefcb6876d0d6 ("pinctrl: Add support for Meson8b")
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/pinctrl/meson/pinctrl-meson8b.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/pinctrl/meson/pinctrl-meson8b.c b/drivers/pinctrl/meson/pinctrl-meson8b.c
index cbe5f5cbddb8..e1b689f840ab 100644
--- a/drivers/pinctrl/meson/pinctrl-meson8b.c
+++ b/drivers/pinctrl/meson/pinctrl-meson8b.c
@@ -662,7 +662,7 @@ static const char * const sd_a_groups[] = {
 
 static const char * const sdxc_a_groups[] = {
 	"sdxc_d0_0_a", "sdxc_d13_0_a", "sdxc_d47_a", "sdxc_clk_a",
-	"sdxc_cmd_a", "sdxc_d0_1_a", "sdxc_d0_13_1_a"
+	"sdxc_cmd_a", "sdxc_d0_1_a", "sdxc_d13_1_a"
 };
 
 static const char * const pcm_a_groups[] = {
-- 
2.19.1


  parent reply	other threads:[~2019-03-13 19:23 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-13 19:16 [PATCH AUTOSEL 4.9 01/24] clk: sunxi: A31: Fix wrong AHB gate number Sasha Levin
2019-03-13 19:16 ` [PATCH AUTOSEL 4.9 02/24] ARM: 8824/1: fix a migrating irq bug when hotplug cpu Sasha Levin
2019-03-13 19:16 ` [PATCH AUTOSEL 4.9 03/24] assoc_array: Fix shortcut creation Sasha Levin
2019-03-13 19:16 ` [PATCH AUTOSEL 4.9 04/24] scsi: libiscsi: Fix race between iscsi_xmit_task and iscsi_complete_task Sasha Levin
2019-03-13 19:16 ` [PATCH AUTOSEL 4.9 05/24] net: systemport: Fix reception of BPDUs Sasha Levin
2019-03-13 19:16 ` Sasha Levin [this message]
2019-03-13 19:16 ` [PATCH AUTOSEL 4.9 07/24] qmi_wwan: apply SET_DTR quirk to Sierra WP7607 Sasha Levin
2019-03-13 19:16 ` [PATCH AUTOSEL 4.9 08/24] net: mv643xx_eth: disable clk on error path in mv643xx_eth_shared_probe() Sasha Levin
2019-03-13 19:16 ` [PATCH AUTOSEL 4.9 09/24] ASoC: topology: free created components in tplg load error Sasha Levin
2019-03-13 19:16 ` [PATCH AUTOSEL 4.9 10/24] arm64: Relax GIC version check during early boot Sasha Levin
2019-03-13 19:16 ` [PATCH AUTOSEL 4.9 11/24] net: marvell: mvneta: fix DMA debug warning Sasha Levin
2019-03-13 19:16 ` [PATCH AUTOSEL 4.9 12/24] kasan, slub: move kasan_poison_slab hook before page_address Sasha Levin
2019-03-13 19:16 ` [PATCH AUTOSEL 4.9 13/24] tmpfs: fix link accounting when a tmpfile is linked in Sasha Levin
2019-03-13 19:16 ` [PATCH AUTOSEL 4.9 14/24] kasan, slab: fix conflicts with CONFIG_HARDENED_USERCOPY Sasha Levin
2019-03-13 19:16 ` [PATCH AUTOSEL 4.9 15/24] kasan, slab: make freelist stored without tags Sasha Levin
2019-03-13 19:16 ` [PATCH AUTOSEL 4.9 16/24] ARCv2: lib: memcpy: fix doing prefetchw outside of buffer Sasha Levin
2019-03-13 19:16 ` [PATCH AUTOSEL 4.9 17/24] ARC: uacces: remove lp_start, lp_end from clobber list Sasha Levin
2019-03-13 19:16 ` [PATCH AUTOSEL 4.9 18/24] phonet: fix building with clang Sasha Levin
2019-03-13 19:16 ` [PATCH AUTOSEL 4.9 19/24] mac80211_hwsim: propagate genlmsg_reply return code Sasha Levin
2019-03-13 19:16 ` [PATCH AUTOSEL 4.9 20/24] net: thunderx: make CFG_DONE message to run through generic send-ack sequence Sasha Levin
2019-03-13 19:16 ` [PATCH AUTOSEL 4.9 21/24] nfp: bpf: fix code-gen bug on BPF_ALU | BPF_XOR | BPF_K Sasha Levin
2019-03-13 19:16 ` [PATCH AUTOSEL 4.9 22/24] nfp: bpf: fix ALU32 high bits clearance bug Sasha Levin
2019-03-13 19:16 ` [PATCH AUTOSEL 4.9 23/24] mdio_bus: Fix use-after-free on device_register fails Sasha Levin
2019-03-13 19:16 ` [PATCH AUTOSEL 4.9 24/24] net: set static variable an initial value in atl2_probe() Sasha Levin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190313191647.160171-6-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=linus.walleij@linaro.org \
    --cc=linux-amlogic@lists.infradead.org \
    --cc=linux-gpio@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=martin.blumenstingl@googlemail.com \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).