diff options
| author | Tom Rini <trini@ti.com> | 2015-02-13 13:11:09 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2015-02-13 13:11:09 -0500 |
| commit | 757566d1567a98f5c331c14f088001dbfe187191 (patch) | |
| tree | 86c9ab53fbefee672f37165f51db398338bf9968 /drivers/i2c/i2c-uclass.c | |
| parent | c445506d73a0fba6472d12510b2d41148f078349 (diff) | |
| parent | b1f6659c420dae9cd06514fbd8342f39b3f326b9 (diff) | |
| download | u-boot-imx-757566d1567a98f5c331c14f088001dbfe187191.zip u-boot-imx-757566d1567a98f5c331c14f088001dbfe187191.tar.gz u-boot-imx-757566d1567a98f5c331c14f088001dbfe187191.tar.bz2 | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'drivers/i2c/i2c-uclass.c')
| -rw-r--r-- | drivers/i2c/i2c-uclass.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/i2c/i2c-uclass.c b/drivers/i2c/i2c-uclass.c index eafa457..a6991bf 100644 --- a/drivers/i2c/i2c-uclass.c +++ b/drivers/i2c/i2c-uclass.c @@ -325,7 +325,7 @@ int dm_i2c_probe(struct udevice *bus, uint chip_addr, uint chip_flags, return ret; } -int i2c_set_bus_speed(struct udevice *bus, unsigned int speed) +int dm_i2c_set_bus_speed(struct udevice *bus, unsigned int speed) { struct dm_i2c_ops *ops = i2c_get_ops(bus); struct dm_i2c_bus *i2c = bus->uclass_priv; @@ -346,12 +346,7 @@ int i2c_set_bus_speed(struct udevice *bus, unsigned int speed) return 0; } -/* - * i2c_get_bus_speed: - * - * Returns speed of selected I2C bus in Hz - */ -int i2c_get_bus_speed(struct udevice *bus) +int dm_i2c_get_bus_speed(struct udevice *bus) { struct dm_i2c_ops *ops = i2c_get_ops(bus); struct dm_i2c_bus *i2c = bus->uclass_priv; @@ -440,7 +435,7 @@ static int i2c_post_probe(struct udevice *dev) i2c->speed_hz = fdtdec_get_int(gd->fdt_blob, dev->of_offset, "clock-frequency", 100000); - return i2c_set_bus_speed(dev, i2c->speed_hz); + return dm_i2c_set_bus_speed(dev, i2c->speed_hz); } static int i2c_post_bind(struct udevice *dev) |