Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit ca88b9b93916f66c6737527aa955d2c1b4758080

Authored by Simon Glass
1 parent 0da0fcd51f
Exists in v2017.01-smarct4x and in 37 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

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>

Showing 4 changed files with 12 additions and 17 deletions Side-by-side Diff

... ... @@ -1730,7 +1730,7 @@
1730 1730 #endif
1731 1731 if (argc == 1) {
1732 1732 #ifdef CONFIG_DM_I2C
1733   - speed = i2c_get_bus_speed(bus);
  1733 + speed = dm_i2c_get_bus_speed(bus);
1734 1734 #else
1735 1735 speed = i2c_get_bus_speed();
1736 1736 #endif
... ... @@ -1740,7 +1740,7 @@
1740 1740 speed = simple_strtoul(argv[1], NULL, 10);
1741 1741 printf("Setting bus speed to %d Hz\n", speed);
1742 1742 #ifdef CONFIG_DM_I2C
1743   - ret = i2c_set_bus_speed(bus, speed);
  1743 + ret = dm_i2c_set_bus_speed(bus, speed);
1744 1744 #else
1745 1745 ret = i2c_set_bus_speed(speed);
1746 1746 #endif
drivers/i2c/i2c-uclass.c
Diff comments   View file @ ca88b9b
... ... @@ -325,7 +325,7 @@
325 325 return ret;
326 326 }
327 327  
328   -int i2c_set_bus_speed(struct udevice *bus, unsigned int speed)
  328 +int dm_i2c_set_bus_speed(struct udevice *bus, unsigned int speed)
329 329 {
330 330 struct dm_i2c_ops *ops = i2c_get_ops(bus);
331 331 struct dm_i2c_bus *i2c = bus->uclass_priv;
... ... @@ -346,12 +346,7 @@
346 346 return 0;
347 347 }
348 348  
349   -/*
350   - * i2c_get_bus_speed:
351   - *
352   - * Returns speed of selected I2C bus in Hz
353   - */
354   -int i2c_get_bus_speed(struct udevice *bus)
  349 +int dm_i2c_get_bus_speed(struct udevice *bus)
355 350 {
356 351 struct dm_i2c_ops *ops = i2c_get_ops(bus);
357 352 struct dm_i2c_bus *i2c = bus->uclass_priv;
... ... @@ -440,7 +435,7 @@
440 435 i2c->speed_hz = fdtdec_get_int(gd->fdt_blob, dev->of_offset,
441 436 "clock-frequency", 100000);
442 437  
443   - return i2c_set_bus_speed(dev, i2c->speed_hz);
  438 + return dm_i2c_set_bus_speed(dev, i2c->speed_hz);
444 439 }
445 440  
446 441 static int i2c_post_bind(struct udevice *dev)
... ... @@ -125,21 +125,21 @@
125 125 struct udevice **devp);
126 126  
127 127 /**
128   - * i2c_set_bus_speed() - set the speed of a bus
  128 + * dm_i2c_set_bus_speed() - set the speed of a bus
129 129 *
130 130 * @bus: Bus to adjust
131 131 * @speed: Requested speed in Hz
132 132 * @return 0 if OK, -EINVAL for invalid values
133 133 */
134   -int i2c_set_bus_speed(struct udevice *bus, unsigned int speed);
  134 +int dm_i2c_set_bus_speed(struct udevice *bus, unsigned int speed);
135 135  
136 136 /**
137   - * i2c_get_bus_speed() - get the speed of a bus
  137 + * dm_i2c_get_bus_speed() - get the speed of a bus
138 138 *
139 139 * @bus: Bus to check
140 140 * @return speed of selected I2C bus in Hz, -ve on error
141 141 */
142   -int i2c_get_bus_speed(struct udevice *bus);
  142 +int dm_i2c_get_bus_speed(struct udevice *bus);
143 143  
144 144 /**
145 145 * i2c_set_chip_flags() - set flags for a chip
... ... @@ -67,10 +67,10 @@
67 67  
68 68 ut_assertok(uclass_get_device_by_seq(UCLASS_I2C, busnum, &bus));
69 69 ut_assertok(i2c_get_chip(bus, chip, 1, &dev));
70   - ut_assertok(i2c_set_bus_speed(bus, 100000));
  70 + ut_assertok(dm_i2c_set_bus_speed(bus, 100000));
71 71 ut_assertok(dm_i2c_read(dev, 0, buf, 5));
72   - ut_assertok(i2c_set_bus_speed(bus, 400000));
73   - ut_asserteq(400000, i2c_get_bus_speed(bus));
  72 + ut_assertok(dm_i2c_set_bus_speed(bus, 400000));
  73 + ut_asserteq(400000, dm_i2c_get_bus_speed(bus));
74 74 ut_assertok(dm_i2c_read(dev, 0, buf, 5));
75 75 ut_asserteq(-EINVAL, dm_i2c_write(dev, 0, buf, 5));
76 76