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:33 +0100
commitfe5acb37a261f875d0448789eb2627d7271b0572 (patch)
tree6df2c9a2494b108a6ef33b094ae25241bed245c0
parentf533d4d46d412c6fcb49eedd0252ee74c1f3b86f (diff)
ARM: davinci: dm355-evm: fix label names in GPIO lookup entries
-rw-r--r--patches.kernel.org/4.20.3-018-ARM-davinci-dm355-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-018-ARM-davinci-dm355-evm-fix-label-names-in-GPIO-.patch b/patches.kernel.org/4.20.3-018-ARM-davinci-dm355-evm-fix-label-names-in-GPIO-.patch
new file mode 100644
index 0000000000..a3365f93e9
--- /dev/null
+++ b/patches.kernel.org/4.20.3-018-ARM-davinci-dm355-evm-fix-label-names-in-GPIO-.patch
@@ -0,0 +1,43 @@
+From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
+Date: Thu, 3 Jan 2019 16:11:02 +0100
+Subject: [PATCH] ARM: davinci: dm355-evm: fix label names in GPIO lookup
+ entries
+References: bnc#1012628
+Patch-mainline: 4.20.3
+Git-commit: 94777ed3b644a1af09843f729b2a3f25794bed0f
+
+commit 94777ed3b644a1af09843f729b2a3f25794bed0f 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-dm355-evm.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c
+index f53a461a606f..f7fa960c23e3 100644
+--- a/arch/arm/mach-davinci/board-dm355-evm.c
++++ b/arch/arm/mach-davinci/board-dm355-evm.c
+@@ -117,9 +117,9 @@ static struct platform_device davinci_nand_device = {
+ static struct gpiod_lookup_table i2c_recovery_gpiod_table = {
+ .dev_id = "i2c_davinci.1",
+ .table = {
+- GPIO_LOOKUP("davinci_gpio.0", DM355_I2C_SDA_PIN, "sda",
++ GPIO_LOOKUP("davinci_gpio", DM355_I2C_SDA_PIN, "sda",
+ GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),
+- GPIO_LOOKUP("davinci_gpio.0", DM355_I2C_SCL_PIN, "scl",
++ GPIO_LOOKUP("davinci_gpio", DM355_I2C_SCL_PIN, "scl",
+ GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),
+ },
+ };
+--
+2.20.1
+
diff --git a/series.conf b/series.conf
index 20a625ebaa..ed5b4cf5dc 100644
--- a/series.conf
+++ b/series.conf
@@ -255,6 +255,7 @@
patches.kernel.org/4.20.3-015-CIFS-Fix-credit-computation-for-compounded-req.patch
patches.kernel.org/4.20.3-016-cifs-Fix-potential-OOB-access-of-lock-element-.patch
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
########################################################
# Build fixes that apply to the vanilla kernel too.