DM: OMAP24XX_I2C: Reduce overhead when used with OF_PLATDATA
authorAdam Ford <aford173@gmail.com>
Tue, 21 Aug 2018 01:24:35 +0000 (20:24 -0500)
committerTom Rini <trini@konsulko.com>
Wed, 12 Sep 2018 01:38:47 +0000 (21:38 -0400)
Platforms with limited resources in SPL may enably OF_PLATDATA,
this limits some of the library functions and cannot extract data
from the device tree.  This patch adds additional wrappers around
these functions to only allow them when OF_CONTROL is enabled and
OF_PLATDATA is not.

Signed-off-by: Adam Ford <aford173@gmail.com>
drivers/i2c/omap24xx_i2c.c

index 0759585c9e1a39322fab2cc25b8d2be8d0e7a7c6..54bf35e552eed47df0ef8a1fc1a4bf2a42c92a68 100644 (file)
@@ -890,6 +890,7 @@ static int omap_i2c_probe(struct udevice *bus)
        return 0;
 }
 
+#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
 static int omap_i2c_ofdata_to_platdata(struct udevice *bus)
 {
        struct omap_i2c *priv = dev_get_priv(bus);
@@ -901,23 +902,26 @@ static int omap_i2c_ofdata_to_platdata(struct udevice *bus)
        return 0;
 }
 
-static const struct dm_i2c_ops omap_i2c_ops = {
-       .xfer           = omap_i2c_xfer,
-       .probe_chip     = omap_i2c_probe_chip,
-       .set_bus_speed  = omap_i2c_set_bus_speed,
-};
-
 static const struct udevice_id omap_i2c_ids[] = {
        { .compatible = "ti,omap3-i2c" },
        { .compatible = "ti,omap4-i2c" },
        { }
 };
+#endif
+
+static const struct dm_i2c_ops omap_i2c_ops = {
+       .xfer           = omap_i2c_xfer,
+       .probe_chip     = omap_i2c_probe_chip,
+       .set_bus_speed  = omap_i2c_set_bus_speed,
+};
 
 U_BOOT_DRIVER(i2c_omap) = {
        .name   = "i2c_omap",
        .id     = UCLASS_I2C,
+#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
        .of_match = omap_i2c_ids,
        .ofdata_to_platdata = omap_i2c_ofdata_to_platdata,
+#endif
        .probe  = omap_i2c_probe,
        .priv_auto_alloc_size = sizeof(struct omap_i2c),
        .ops    = &omap_i2c_ops,