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
commitc8bb7d919d5229a63616b1118bd169d0eef53e90 (patch)
tree4dab14b34ec40aa8c18e26ff74a6246290ff130a
parent10972a83ebdf06f001e194cd318780af91c2297f (diff)
ARM: davinci: dm644x-evm: fix label names in GPIO lookup entries
-rw-r--r--patches.kernel.org/4.20.3-021-ARM-davinci-dm644x-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-021-ARM-davinci-dm644x-evm-fix-label-names-in-GPIO.patch b/patches.kernel.org/4.20.3-021-ARM-davinci-dm644x-evm-fix-label-names-in-GPIO.patch
new file mode 100644
index 0000000000..1cf31f7e8c
--- /dev/null
+++ b/patches.kernel.org/4.20.3-021-ARM-davinci-dm644x-evm-fix-label-names-in-GPIO.patch
@@ -0,0 +1,43 @@
+From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
+Date: Thu, 3 Jan 2019 16:11:03 +0100
+Subject: [PATCH] ARM: davinci: dm644x-evm: fix label names in GPIO lookup
+ entries
+References: bnc#1012628
+Patch-mainline: 4.20.3
+Git-commit: 7f1015b29d9b9eb1cd3c038d6c30d698c6d7782e
+
+commit 7f1015b29d9b9eb1cd3c038d6c30d698c6d7782e 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-dm644x-evm.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c
+index e4a8f9225d16..f752d828e42f 100644
+--- a/arch/arm/mach-davinci/board-dm644x-evm.c
++++ b/arch/arm/mach-davinci/board-dm644x-evm.c
+@@ -638,9 +638,9 @@ static struct i2c_board_info __initdata i2c_info[] = {
+ static struct gpiod_lookup_table i2c_recovery_gpiod_table = {
+ .dev_id = "i2c_davinci.1",
+ .table = {
+- GPIO_LOOKUP("davinci_gpio.0", DM644X_I2C_SDA_PIN, "sda",
++ GPIO_LOOKUP("davinci_gpio", DM644X_I2C_SDA_PIN, "sda",
+ GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),
+- GPIO_LOOKUP("davinci_gpio.0", DM644X_I2C_SCL_PIN, "scl",
++ GPIO_LOOKUP("davinci_gpio", DM644X_I2C_SCL_PIN, "scl",
+ GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),
+ },
+ };
+--
+2.20.1
+
diff --git a/series.conf b/series.conf
index cb3a95c886..8c6f4d961f 100644
--- a/series.conf
+++ b/series.conf
@@ -258,6 +258,7 @@
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
+ patches.kernel.org/4.20.3-021-ARM-davinci-dm644x-evm-fix-label-names-in-GPIO.patch
########################################################
# Build fixes that apply to the vanilla kernel too.