summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2015-02-05 21:41:32 -0700
committerSimon Glass <sjg@chromium.org>2015-02-12 10:35:33 -0700
commitca88b9b93916f66c6737527aa955d2c1b4758080 (patch)
tree619adac0941b976447496e49648e8e26adc79479 /common
parent0da0fcd51f6566d84eb24cbbd4c8ad784c702849 (diff)
downloadu-boot-imx-ca88b9b93916f66c6737527aa955d2c1b4758080.zip
u-boot-imx-ca88b9b93916f66c6737527aa955d2c1b4758080.tar.gz
u-boot-imx-ca88b9b93916f66c6737527aa955d2c1b4758080.tar.bz2
dm: i2c: Add a dm_ prefix to driver model bus speed functions
As with i2c_read() and i2c_write(), add a dm_ prefix to the driver model versions of these functions to avoid conflicts. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Heiko Schocher <hs@denx.de>
Diffstat (limited to 'common')
-rw-r--r--common/cmd_i2c.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/cmd_i2c.c b/common/cmd_i2c.c
index 7c3ad00..fe8f77a 100644
--- a/common/cmd_i2c.c
+++ b/common/cmd_i2c.c
@@ -1730,7 +1730,7 @@ static int do_i2c_bus_speed(cmd_tbl_t * cmdtp, int flag, int argc, char * const
#endif
if (argc == 1) {
#ifdef CONFIG_DM_I2C
- speed = i2c_get_bus_speed(bus);
+ speed = dm_i2c_get_bus_speed(bus);
#else
speed = i2c_get_bus_speed();
#endif
@@ -1740,7 +1740,7 @@ static int do_i2c_bus_speed(cmd_tbl_t * cmdtp, int flag, int argc, char * const
speed = simple_strtoul(argv[1], NULL, 10);
printf("Setting bus speed to %d Hz\n", speed);
#ifdef CONFIG_DM_I2C
- ret = i2c_set_bus_speed(bus, speed);
+ ret = dm_i2c_set_bus_speed(bus, speed);
#else
ret = i2c_set_bus_speed(speed);
#endif