diff options
| author | Tom Rini <trini@konsulko.com> | 2016-07-26 12:29:30 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-07-26 12:29:30 (GMT) |
| commit | c3c9fd31bad80ead1682de917e27fa6073eae02b (patch) | |
| tree | 4cb097f843fb0ab60160035c67799a753fc7c13e /drivers/i2c/i2c-uclass.c | |
| parent | c482c60a14e5fa44a62e13bab4d07c52c37915dc (diff) | |
| parent | 6e677caf8cf0cc1a2310f2e4e9f27b81c674bc95 (diff) | |
| download | u-boot-c3c9fd31bad80ead1682de917e27fa6073eae02b.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-i2c
Diffstat (limited to 'drivers/i2c/i2c-uclass.c')
| -rw-r--r-- | drivers/i2c/i2c-uclass.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/i2c/i2c-uclass.c b/drivers/i2c/i2c-uclass.c index 50b99ea..20b30ff 100644 --- a/drivers/i2c/i2c-uclass.c +++ b/drivers/i2c/i2c-uclass.c @@ -467,6 +467,7 @@ int i2c_deblock(struct udevice *bus) return ops->deblock(bus); } +#if CONFIG_IS_ENABLED(OF_CONTROL) int i2c_chip_ofdata_to_platdata(const void *blob, int node, struct dm_i2c_chip *chip) { @@ -482,31 +483,44 @@ int i2c_chip_ofdata_to_platdata(const void *blob, int node, return 0; } +#endif static int i2c_post_probe(struct udevice *dev) { +#if CONFIG_IS_ENABLED(OF_CONTROL) struct dm_i2c_bus *i2c = dev_get_uclass_priv(dev); i2c->speed_hz = fdtdec_get_int(gd->fdt_blob, dev->of_offset, "clock-frequency", 100000); return dm_i2c_set_bus_speed(dev, i2c->speed_hz); +#else + return 0; +#endif } static int i2c_post_bind(struct udevice *dev) { +#if CONFIG_IS_ENABLED(OF_CONTROL) /* Scan the bus for devices */ return dm_scan_fdt_node(dev, gd->fdt_blob, dev->of_offset, false); +#else + return 0; +#endif } static int i2c_child_post_bind(struct udevice *dev) { +#if CONFIG_IS_ENABLED(OF_CONTROL) struct dm_i2c_chip *plat = dev_get_parent_platdata(dev); if (dev->of_offset == -1) return 0; return i2c_chip_ofdata_to_platdata(gd->fdt_blob, dev->of_offset, plat); +#else + return 0; +#endif } UCLASS_DRIVER(i2c) = { |