Home Home > GIT Browse > stable
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2019-01-18 07:53:27 +0100
committerJiri Slaby <jslaby@suse.cz>2019-01-18 07:53:34 +0100
commit10972a83ebdf06f001e194cd318780af91c2297f (patch)
treeb9966ae5f166355dc906b287d4ddf6349ae6ef91
parentf0057f4f4d10273760298b8999575500a5136e41 (diff)
ARM: davinci: omapl138-hawk: fix label names in GPIO lookup
entries (bnc#1012628).
-rw-r--r--patches.kernel.org/4.20.3-020-ARM-davinci-omapl138-hawk-fix-label-names-in-G.patch43
-rw-r--r--series.conf1
2 files changed, 44 insertions, 0 deletions
diff --git a/patches.kernel.org/4.20.3-020-ARM-davinci-omapl138-hawk-fix-label-names-in-G.patch b/patches.kernel.org/4.20.3-020-ARM-davinci-omapl138-hawk-fix-label-names-in-G.patch
new file mode 100644
index 0000000000..926b2c0ed2
--- /dev/null
+++ b/patches.kernel.org/4.20.3-020-ARM-davinci-omapl138-hawk-fix-label-names-in-G.patch
@@ -0,0 +1,43 @@
+From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
+Date: Thu, 3 Jan 2019 16:11:04 +0100
+Subject: [PATCH] ARM: davinci: omapl138-hawk: fix label names in GPIO lookup
+ entries
+References: bnc#1012628
+Patch-mainline: 4.20.3
+Git-commit: 054b8dc381b1c784852ad3e109270d236a58b71d
+
+commit 054b8dc381b1c784852ad3e109270d236a58b71d upstream.
+
+Since commit 587f7a694f01 ("gpio: davinci: Use dev name for label and
+automatic base selection") the gpiochip label no longer has an ID
+suffix. Update the GPIO lookup entries.
+
+Fixes: 587f7a694f01 ("gpio: davinci: Use dev name for label and automatic base selection")
+Cc: stable@vger.kernel.org
+Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
+Signed-off-by: Sekhar Nori <nsekhar@ti.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ arch/arm/mach-davinci/board-omapl138-hawk.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c
+index 8e8d51f4a276..94c4f126ef86 100644
+--- a/arch/arm/mach-davinci/board-omapl138-hawk.c
++++ b/arch/arm/mach-davinci/board-omapl138-hawk.c
+@@ -134,9 +134,9 @@ static const short hawk_mmcsd0_pins[] = {
+ static struct gpiod_lookup_table mmc_gpios_table = {
+ .dev_id = "da830-mmc.0",
+ .table = {
+- GPIO_LOOKUP("davinci_gpio.0", DA850_HAWK_MMCSD_CD_PIN, "cd",
++ GPIO_LOOKUP("davinci_gpio", DA850_HAWK_MMCSD_CD_PIN, "cd",
+ GPIO_ACTIVE_LOW),
+- GPIO_LOOKUP("davinci_gpio.0", DA850_HAWK_MMCSD_WP_PIN, "wp",
++ GPIO_LOOKUP("davinci_gpio", DA850_HAWK_MMCSD_WP_PIN, "wp",
+ GPIO_ACTIVE_LOW),
+ },
+ };
+--
+2.20.1
+
diff --git a/series.conf b/series.conf
index 7e81e2a1f9..cb3a95c886 100644
--- a/series.conf
+++ b/series.conf
@@ -257,6 +257,7 @@
patches.kernel.org/4.20.3-017-cifs-check-kzalloc-return.patch
patches.kernel.org/4.20.3-018-ARM-davinci-dm355-evm-fix-label-names-in-GPIO-.patch
patches.kernel.org/4.20.3-019-ARM-davinci-da850-evm-fix-label-names-in-GPIO-.patch
+ patches.kernel.org/4.20.3-020-ARM-davinci-omapl138-hawk-fix-label-names-in-G.patch
########################################################
# Build fixes that apply to the vanilla kernel too.