diff options
| author | Tom Rini <trini@konsulko.com> | 2020-01-29 09:34:13 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-01-29 09:34:13 -0500 |
| commit | e7ab1cb3f0421ad8e8435a8258790e238c623ea2 (patch) | |
| tree | fb2e7cce740a30f137dcdce0d2f4b2512ae58498 /drivers/i2c/imx_lpi2c.c | |
| parent | 3e12744a90241b08788ab7f20b5437381dbc9f68 (diff) | |
| parent | 2034f6c27fc91407fe8bbd36670714b77d9ef1dc (diff) | |
Merge tag 'for-v2020.04' of https://gitlab.denx.de/u-boot/custodians/u-boot-i2c
i2c changes for 2020.04
- updates the Designware I2C driver
- get timings from device tree
- handle units in nanoseconds
- make sure that the requested bus speed is not exceeded
- few smaller clean-ups
- adds enums for i2c speed and update drivers which use them
- global_data: remove unused mxc_i2c specific field
Diffstat (limited to 'drivers/i2c/imx_lpi2c.c')
| -rw-r--r-- | drivers/i2c/imx_lpi2c.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/i2c/imx_lpi2c.c b/drivers/i2c/imx_lpi2c.c index 2de99d019e0..c9d3faa9119 100644 --- a/drivers/i2c/imx_lpi2c.c +++ b/drivers/i2c/imx_lpi2c.c @@ -169,7 +169,7 @@ static int bus_i2c_start(struct udevice *bus, u8 addr, u8 dir) debug("i2c: start check busy bus: 0x%x\n", result); /* Try to init the lpi2c then check the bus busy again */ - bus_i2c_init(bus, 100000); + bus_i2c_init(bus, I2C_SPEED_STANDARD_RATE); result = imx_lpci2c_check_busy_bus(regs); if (result) { printf("i2c: Error check busy bus: 0x%x\n", result); @@ -388,13 +388,13 @@ static int imx_lpi2c_probe_chip(struct udevice *bus, u32 chip, result = bus_i2c_start(bus, chip, 0); if (result) { bus_i2c_stop(bus); - bus_i2c_init(bus, 100000); + bus_i2c_init(bus, I2C_SPEED_STANDARD_RATE); return result; } result = bus_i2c_stop(bus); if (result) - bus_i2c_init(bus, 100000); + bus_i2c_init(bus, I2C_SPEED_STANDARD_RATE); return result; } @@ -489,7 +489,7 @@ static int imx_lpi2c_probe(struct udevice *bus) return ret; } - ret = bus_i2c_init(bus, 100000); + ret = bus_i2c_init(bus, I2C_SPEED_STANDARD_RATE); if (ret < 0) return ret; |