Merge branch '2020-02-24-ci-htmldocs'

[oweals/u-boot.git] / drivers / i2c / imx_lpi2c.c

diff --git a/drivers/i2c/imx_lpi2c.c b/drivers/i2c/imx_lpi2c.c
index 6c343072fb248299579e9a3b7d258d41b104f70b..62e68046d6c7c35bf4fb5c92e78d5853d4e528c9 100644 (file)
--- a/drivers/i2c/imx_lpi2c.c
+++ b/drivers/i2c/imx_lpi2c.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <fdtdec.h>
 #include <i2c.h>
+#include <dm/device_compat.h>
 
 #define LPI2C_FIFO_SIZE 4
 #define LPI2C_NACK_TOUT_MS 1
@@ -105,7 +106,7 @@ static int bus_i2c_send(struct udevice *bus, u8 *txbuf, int len)
        while (len--) {
                result = bus_i2c_wait_for_tx_ready(regs);
                if (result) {
-                       debug("i2c: send wait fot tx ready: %d\n", result);
+                       debug("i2c: send wait for tx ready: %d\n", result);
                        return result;
                }
                writel(*txbuf++, &regs->mtdr);
@@ -169,7 +170,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 +389,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;
 }
@@ -471,6 +472,17 @@ static int imx_lpi2c_probe(struct udevice *bus)
                        dev_err(bus, "Failed to enable per clk\n");
                        return ret;
                }
+
+               ret = clk_get_by_name(bus, "ipg", &i2c_bus->ipg_clk);
+               if (ret) {
+                       dev_err(bus, "Failed to get ipg clk\n");
+                       return ret;
+               }
+               ret = clk_enable(&i2c_bus->ipg_clk);
+               if (ret) {
+                       dev_err(bus, "Failed to enable ipg clk\n");
+                       return ret;
+               }
        } else {
                /* To i.MX7ULP, only i2c4-7 can be handled by A7 core */
                ret = enable_i2c_clk(1, bus->seq);
@@ -478,11 +490,11 @@ 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;
 
-       debug("i2c : controller bus %d at %lu , speed %d: ",
+       debug("i2c : controller bus %d at 0x%lx , speed %d: ",
              bus->seq, i2c_bus->base,
              i2c_bus->speed);