summaryrefslogtreecommitdiff
path: root/drivers/i2c/busses/i2c-iop3xx.h
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2019-06-01 00:37:56 +0200
committerWolfram Sang <wsa@the-dreams.de>2019-06-12 13:20:23 +0200
commitfdb7e884ad617f8aa69abdd7f39e3fdac85e081e (patch)
tree8040de47cccdb9797aa15272df7d0afde3431307 /drivers/i2c/busses/i2c-iop3xx.h
parented7357c9f9b6a560992446c37260be25e514c4ab (diff)
i2c: iop: Use GPIO descriptors
The IOP3xx has some elaborate code to directly slam the GPIO lines multiplexed with I2C down low before enablement, apparently a workaround for a hardware bug found in the early chips. After consulting the developer documentation for IOP80321 and IOP80331 I can clearly see that this may be useful for IOP80321 family (mach-iop32x) but it is highly dubious for any 80331 series or later chip: in these chips the lines are not multiplexed for UARTs. We convert the code to pass optional GPIO descriptors and register these only on the 80321-based boards where it makes sense, optionally obtain them in the driver and use the gpiod_set_raw_value() to ascertain the line gets driven low when needed. The GPIO driver does not give the GPIO chip a reasonable label so the patch also adds that so that these machine descriptor tables can be used. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Dan Williams <dan.j.williams@intel.com> Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/i2c/busses/i2c-iop3xx.h')
-rw-r--r--drivers/i2c/busses/i2c-iop3xx.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/i2c/busses/i2c-iop3xx.h b/drivers/i2c/busses/i2c-iop3xx.h
index 2d6929c2bd92..231897838386 100644
--- a/drivers/i2c/busses/i2c-iop3xx.h
+++ b/drivers/i2c/busses/i2c-iop3xx.h
@@ -98,6 +98,8 @@ struct i2c_algo_iop3xx_data {
spinlock_t lock;
u32 SR_enabled, SR_received;
int id;
+ struct gpio_desc *gpio_scl;
+ struct gpio_desc *gpio_sda;
};
#endif /* I2C_IOP3XX_H */