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
commit252a855263b29b9e485dbb91d54a1abf90be8fbd (patch)
treee86771a9709cf6c34ed8ef0f35a535359b7521fc
parentc8bb7d919d5229a63616b1118bd169d0eef53e90 (diff)
ARM: davinci: da830-evm: fix label names in GPIO lookup entries
-rw-r--r--patches.kernel.org/4.20.3-022-ARM-davinci-da830-evm-fix-label-names-in-GPIO-.patch43
-rw-r--r--series.conf1
2 files changed, 44 insertions, 0 deletions
diff --git a/patches.kernel.org/4.20.3-022-ARM-davinci-da830-evm-fix-label-names-in-GPIO-.patch b/patches.kernel.org/4.20.3-022-ARM-davinci-da830-evm-fix-label-names-in-GPIO-.patch
new file mode 100644
index 0000000000..a53c544515
--- /dev/null
+++ b/patches.kernel.org/4.20.3-022-ARM-davinci-da830-evm-fix-label-names-in-GPIO-.patch
@@ -0,0 +1,43 @@
+From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
+Date: Thu, 3 Jan 2019 16:11:00 +0100
+Subject: [PATCH] ARM: davinci: da830-evm: fix label names in GPIO lookup
+ entries
+References: bnc#1012628
+Patch-mainline: 4.20.3
+Git-commit: cc557afb4d10cba175fd08d51c557004a229eded
+
+commit cc557afb4d10cba175fd08d51c557004a229eded 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-da830-evm.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c
+index 7d8ab36ff83d..b3a3f5a59b5c 100644
+--- a/arch/arm/mach-davinci/board-da830-evm.c
++++ b/arch/arm/mach-davinci/board-da830-evm.c
+@@ -207,9 +207,9 @@ static struct gpiod_lookup_table mmc_gpios_table = {
+ .dev_id = "da830-mmc.0",
+ .table = {
+ /* gpio chip 1 contains gpio range 32-63 */
+- GPIO_LOOKUP("davinci_gpio.0", DA830_MMCSD_CD_PIN, "cd",
++ GPIO_LOOKUP("davinci_gpio", DA830_MMCSD_CD_PIN, "cd",
+ GPIO_ACTIVE_LOW),
+- GPIO_LOOKUP("davinci_gpio.0", DA830_MMCSD_WP_PIN, "wp",
++ GPIO_LOOKUP("davinci_gpio", DA830_MMCSD_WP_PIN, "wp",
+ GPIO_ACTIVE_LOW),
+ },
+ };
+--
+2.20.1
+
diff --git a/series.conf b/series.conf
index 8c6f4d961f..369debfbfc 100644
--- a/series.conf
+++ b/series.conf
@@ -259,6 +259,7 @@
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
patches.kernel.org/4.20.3-021-ARM-davinci-dm644x-evm-fix-label-names-in-GPIO.patch
+ patches.kernel.org/4.20.3-022-ARM-davinci-da830-evm-fix-label-names-in-GPIO-.patch
########################################################
# Build fixes that apply to the vanilla kernel too.