Home Home > GIT Browse > SLE12-SP4-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-02-21 09:16:00 +0100
committerTakashi Iwai <tiwai@suse.de>2019-02-21 09:16:04 +0100
commitb0097cc92e6fa097fe1a05288d1b7a28668069c5 (patch)
tree32f8016cd86bf31955450d0a6272e645374f1077
parent7276d78aae4bf8aaadd3a986cda015718552ebb5 (diff)
pinctrl: meson: meson8b: fix the sdxc_a data 1..3 pins
(bsc#1051510).
-rw-r--r--patches.drivers/pinctrl-meson-meson8b-fix-the-sdxc_a-data-1.3-pins.patch38
-rw-r--r--series.conf1
2 files changed, 39 insertions, 0 deletions
diff --git a/patches.drivers/pinctrl-meson-meson8b-fix-the-sdxc_a-data-1.3-pins.patch b/patches.drivers/pinctrl-meson-meson8b-fix-the-sdxc_a-data-1.3-pins.patch
new file mode 100644
index 0000000000..e772f78d22
--- /dev/null
+++ b/patches.drivers/pinctrl-meson-meson8b-fix-the-sdxc_a-data-1.3-pins.patch
@@ -0,0 +1,38 @@
+From c17abcfa93bf0be5e48bb011607d237ac2bfc839 Mon Sep 17 00:00:00 2001
+From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
+Date: Sat, 9 Feb 2019 02:01:01 +0100
+Subject: [PATCH] pinctrl: meson: meson8b: fix the sdxc_a data 1..3 pins
+Git-commit: c17abcfa93bf0be5e48bb011607d237ac2bfc839
+Patch-mainline: v5.0
+References: bsc#1051510
+
+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>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ 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 c69ca95b1ad5..0f140a802137 100644
+--- a/drivers/pinctrl/meson/pinctrl-meson8b.c
++++ b/drivers/pinctrl/meson/pinctrl-meson8b.c
+@@ -693,7 +693,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.16.4
+
diff --git a/series.conf b/series.conf
index 605ba19901..ffd4460b43 100644
--- a/series.conf
+++ b/series.conf
@@ -20401,6 +20401,7 @@
patches.fixes/KEYS-allow-reaching-the-keys-quotas-exactly.patch
patches.fixes/assoc_array-Fix-shortcut-creation.patch
patches.fixes/keys-Timestamp-new-keys.patch
+ patches.drivers/pinctrl-meson-meson8b-fix-the-sdxc_a-data-1.3-pins.patch
patches.drivers/ALSA-hda-realtek-Headset-microphone-and-internal-spe.patch
patches.drivers/ALSA-hda-realtek-Disable-PC-beep-in-passthrough-on-a.patch