Home Home > GIT Browse > SLE15-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-02-14 12:09:56 +0100
committerTakashi Iwai <tiwai@suse.de>2019-02-14 12:10:17 +0100
commit425b535d3c0ea95a028a6e7fe66c00f5f9e6edcf (patch)
tree231a1333af724ecfa240b20b0946fee364a4d8c7
parentc02ca32ad3a37842386f5d62ceb66c1e25280007 (diff)
pinctrl: meson: meson8b: fix the GPIO function for the GPIOAO
pins (bsc#1051510).
-rw-r--r--patches.drivers/pinctrl-meson-meson8b-fix-the-GPIO-function-for-the-.patch65
-rw-r--r--series.conf1
2 files changed, 66 insertions, 0 deletions
diff --git a/patches.drivers/pinctrl-meson-meson8b-fix-the-GPIO-function-for-the-.patch b/patches.drivers/pinctrl-meson-meson8b-fix-the-GPIO-function-for-the-.patch
new file mode 100644
index 0000000000..cd460397e8
--- /dev/null
+++ b/patches.drivers/pinctrl-meson-meson8b-fix-the-GPIO-function-for-the-.patch
@@ -0,0 +1,65 @@
+From 2b745ac3cceb8fc1d9985990c8241a821ea97e53 Mon Sep 17 00:00:00 2001
+From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
+Date: Sun, 9 Dec 2018 20:50:51 +0100
+Subject: [PATCH] pinctrl: meson: meson8b: fix the GPIO function for the GPIOAO pins
+Git-commit: 2b745ac3cceb8fc1d9985990c8241a821ea97e53
+Patch-mainline: v5.0-rc1
+References: bsc#1051510
+
+The GPIOAO pins (as well as the two exotic GPIO_BSD_EN and GPIO_TEST_N)
+only belong to the pin controller in the AO domain. With the current
+definition these pins cannot be referred to in .dts files as group
+(which is possible on GXBB and GXL for example).
+
+Add a separate "gpio_aobus" function to fix the mapping between the pin
+controller and the GPIO pins in the AO domain. This is similar to how
+the GXBB and GXL drivers implement this functionality.
+
+Fixes: 9dab1868ec0db4 ("pinctrl: amlogic: Make driver independent from two-domain configuration")
+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 | 13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/drivers/pinctrl/meson/pinctrl-meson8b.c b/drivers/pinctrl/meson/pinctrl-meson8b.c
+index bb2a30964fc6..27ddedf47115 100644
+--- a/drivers/pinctrl/meson/pinctrl-meson8b.c
++++ b/drivers/pinctrl/meson/pinctrl-meson8b.c
+@@ -646,16 +646,18 @@ static const char * const gpio_groups[] = {
+ "BOOT_10", "BOOT_11", "BOOT_12", "BOOT_13", "BOOT_14",
+ "BOOT_15", "BOOT_16", "BOOT_17", "BOOT_18",
+
+- "GPIOAO_0", "GPIOAO_1", "GPIOAO_2", "GPIOAO_3",
+- "GPIOAO_4", "GPIOAO_5", "GPIOAO_6", "GPIOAO_7",
+- "GPIOAO_8", "GPIOAO_9", "GPIOAO_10", "GPIOAO_11",
+- "GPIOAO_12", "GPIOAO_13", "GPIO_BSD_EN", "GPIO_TEST_N",
+-
+ "DIF_0_P", "DIF_0_N", "DIF_1_P", "DIF_1_N",
+ "DIF_2_P", "DIF_2_N", "DIF_3_P", "DIF_3_N",
+ "DIF_4_P", "DIF_4_N"
+ };
+
++static const char * const gpio_aobus_groups[] = {
++ "GPIOAO_0", "GPIOAO_1", "GPIOAO_2", "GPIOAO_3",
++ "GPIOAO_4", "GPIOAO_5", "GPIOAO_6", "GPIOAO_7",
++ "GPIOAO_8", "GPIOAO_9", "GPIOAO_10", "GPIOAO_11",
++ "GPIOAO_12", "GPIOAO_13", "GPIO_BSD_EN", "GPIO_TEST_N"
++};
++
+ static const char * const sd_a_groups[] = {
+ "sd_d0_a", "sd_d1_a", "sd_d2_a", "sd_d3_a", "sd_clk_a",
+ "sd_cmd_a"
+@@ -871,6 +873,7 @@ static struct meson_pmx_func meson8b_cbus_functions[] = {
+ };
+
+ static struct meson_pmx_func meson8b_aobus_functions[] = {
++ FUNCTION(gpio_aobus),
+ FUNCTION(uart_ao),
+ FUNCTION(uart_ao_b),
+ FUNCTION(i2c_slave_ao),
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index 653e392e5a..021074b523 100644
--- a/series.conf
+++ b/series.conf
@@ -20127,6 +20127,7 @@
patches.drivers/pinctrl-sunxi-a64-Rename-function-csi0-to-csi.patch
patches.drivers/pinctrl-sunxi-a64-Rename-function-ts0-to-ts.patch
patches.drivers/pinctrl-meson-meson8-fix-the-GPIO-function-for-the-G.patch
+ patches.drivers/pinctrl-meson-meson8b-fix-the-GPIO-function-for-the-.patch
patches.drivers/pinctrl-sh-pfc-r8a7740-Add-missing-REF125CK-pin-to-g.patch
patches.drivers/pinctrl-sh-pfc-r8a7740-Add-missing-LCD0-marks-to-lcd.patch
patches.drivers/pinctrl-sh-pfc-r8a7791-Remove-bogus-ctrl-marks-from-.patch