summaryrefslogtreecommitdiffstats
path: root/arch/mips/ath79
diff options
context:
space:
mode:
authorLinus Walleij2018-05-26 19:12:51 +0200
committerJames Hogan2018-06-18 23:19:50 +0200
commit326345f995a83e326fa2e01d54bfa9a6a307bd4d (patch)
tree852fdc6af0aa418742323a37b59b70d14cfd6350 /arch/mips/ath79
parentLinux 4.18-rc1 (diff)
downloadkernel-qcow2-linux-326345f995a83e326fa2e01d54bfa9a6a307bd4d.tar.gz
kernel-qcow2-linux-326345f995a83e326fa2e01d54bfa9a6a307bd4d.tar.xz
kernel-qcow2-linux-326345f995a83e326fa2e01d54bfa9a6a307bd4d.zip
MIPS: pb44: Fix i2c-gpio GPIO descriptor table
I used bad names in my clumsiness when rewriting many board files to use GPIO descriptors instead of platform data. A few had the platform_device ID set to -1 which would indeed give the device name "i2c-gpio". But several had it set to >=0 which gives the names "i2c-gpio.0", "i2c-gpio.1" ... Fix the one affected board in the MIPS tree. Sorry. Fixes: b2e63555592f ("i2c: gpio: Convert to use descriptors") Reported-by: Simon Guinot <simon.guinot@sequanux.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Reviewed-by: Paul Burton <paul.burton@mips.com> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Wolfram Sang <wsa@the-dreams.de> Cc: Simon Guinot <simon.guinot@sequanux.org> Cc: linux-mips@linux-mips.org Cc: <stable@vger.kernel.org> # 4.15+ Patchwork: https://patchwork.linux-mips.org/patch/19387/ Signed-off-by: James Hogan <jhogan@kernel.org>
Diffstat (limited to 'arch/mips/ath79')
-rw-r--r--arch/mips/ath79/mach-pb44.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/ath79/mach-pb44.c b/arch/mips/ath79/mach-pb44.c
index 6b2c6f3baefa..75fb96ca61db 100644
--- a/arch/mips/ath79/mach-pb44.c
+++ b/arch/mips/ath79/mach-pb44.c
@@ -34,7 +34,7 @@
#define PB44_KEYS_DEBOUNCE_INTERVAL (3 * PB44_KEYS_POLL_INTERVAL)
static struct gpiod_lookup_table pb44_i2c_gpiod_table = {
- .dev_id = "i2c-gpio",
+ .dev_id = "i2c-gpio.0",
.table = {
GPIO_LOOKUP_IDX("ath79-gpio", PB44_GPIO_I2C_SDA,
NULL, 0, GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),