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 /include/i2c.h | |
parent | c445506d73a0fba6472d12510b2d41148f078349 (diff) | |
parent | b1f6659c420dae9cd06514fbd8342f39b3f326b9 (diff) |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'include/i2c.h')
-rw-r--r-- | include/i2c.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/include/i2c.h b/include/i2c.h index 27fe00f173..31b038991e 100644 --- a/include/i2c.h +++ b/include/i2c.h @@ -25,14 +25,13 @@ * enough as to be incompatible for compilation purposes. */ -#ifdef CONFIG_DM_I2C - enum dm_i2c_chip_flags { DM_I2C_CHIP_10BIT = 1 << 0, /* Use 10-bit addressing */ DM_I2C_CHIP_RD_ADDRESS = 1 << 1, /* Send address for each read byte */ DM_I2C_CHIP_WR_ADDRESS = 1 << 2, /* Send address for each write byte */ }; +struct udevice; /** * struct dm_i2c_chip - information about an i2c chip * @@ -125,21 +124,21 @@ int dm_i2c_probe(struct udevice *bus, uint chip_addr, uint chip_flags, struct udevice **devp); /** - * i2c_set_bus_speed() - set the speed of a bus + * dm_i2c_set_bus_speed() - set the speed of a bus * * @bus: Bus to adjust * @speed: Requested speed in Hz * @return 0 if OK, -EINVAL for invalid values */ -int i2c_set_bus_speed(struct udevice *bus, unsigned int speed); +int dm_i2c_set_bus_speed(struct udevice *bus, unsigned int speed); /** - * i2c_get_bus_speed() - get the speed of a bus + * dm_i2c_get_bus_speed() - get the speed of a bus * * @bus: Bus to check * @return speed of selected I2C bus in Hz, -ve on error */ -int i2c_get_bus_speed(struct udevice *bus); +int dm_i2c_get_bus_speed(struct udevice *bus); /** * i2c_set_chip_flags() - set flags for a chip @@ -439,8 +438,6 @@ int i2c_get_chip_for_busnum(int busnum, int chip_addr, uint offset_len, int i2c_chip_ofdata_to_platdata(const void *blob, int node, struct dm_i2c_chip *chip); -#endif - #ifndef CONFIG_DM_I2C /* |