| From 73157704109e91356b44b215f247dd0ee1e4ccc5 Mon Sep 17 00:00:00 2001 |
| From: Linus Walleij <linus.walleij@linaro.org> |
| Date: Sat, 26 May 2018 19:12:51 +0200 |
| Subject: [PATCH 0657/1795] 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> |
| (cherry picked from commit 326345f995a83e326fa2e01d54bfa9a6a307bd4d) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| --- |
| arch/mips/ath79/mach-pb44.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| 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), |
| -- |
| 2.19.0 |
| |
