|
@@ -562,7 +562,7 @@ int i2c_deblock(struct udevice *bus)
|
|
return ops->deblock(bus);
|
|
return ops->deblock(bus);
|
|
}
|
|
}
|
|
|
|
|
|
-#if CONFIG_IS_ENABLED(OF_CONTROL)
|
|
|
|
|
|
+#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
|
|
int i2c_chip_ofdata_to_platdata(struct udevice *dev, struct dm_i2c_chip *chip)
|
|
int i2c_chip_ofdata_to_platdata(struct udevice *dev, struct dm_i2c_chip *chip)
|
|
{
|
|
{
|
|
int addr;
|
|
int addr;
|
|
@@ -584,7 +584,7 @@ int i2c_chip_ofdata_to_platdata(struct udevice *dev, struct dm_i2c_chip *chip)
|
|
|
|
|
|
static int i2c_post_probe(struct udevice *dev)
|
|
static int i2c_post_probe(struct udevice *dev)
|
|
{
|
|
{
|
|
-#if CONFIG_IS_ENABLED(OF_CONTROL)
|
|
|
|
|
|
+#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
|
|
struct dm_i2c_bus *i2c = dev_get_uclass_priv(dev);
|
|
struct dm_i2c_bus *i2c = dev_get_uclass_priv(dev);
|
|
|
|
|
|
i2c->speed_hz = dev_read_u32_default(dev, "clock-frequency", 100000);
|
|
i2c->speed_hz = dev_read_u32_default(dev, "clock-frequency", 100000);
|
|
@@ -597,7 +597,7 @@ static int i2c_post_probe(struct udevice *dev)
|
|
|
|
|
|
static int i2c_child_post_bind(struct udevice *dev)
|
|
static int i2c_child_post_bind(struct udevice *dev)
|
|
{
|
|
{
|
|
-#if CONFIG_IS_ENABLED(OF_CONTROL)
|
|
|
|
|
|
+#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
|
|
struct dm_i2c_chip *plat = dev_get_parent_platdata(dev);
|
|
struct dm_i2c_chip *plat = dev_get_parent_platdata(dev);
|
|
|
|
|
|
if (!dev_of_valid(dev))
|
|
if (!dev_of_valid(dev))
|
|
@@ -612,7 +612,7 @@ UCLASS_DRIVER(i2c) = {
|
|
.id = UCLASS_I2C,
|
|
.id = UCLASS_I2C,
|
|
.name = "i2c",
|
|
.name = "i2c",
|
|
.flags = DM_UC_FLAG_SEQ_ALIAS,
|
|
.flags = DM_UC_FLAG_SEQ_ALIAS,
|
|
-#if CONFIG_IS_ENABLED(OF_CONTROL)
|
|
|
|
|
|
+#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
|
|
.post_bind = dm_scan_fdt_dev,
|
|
.post_bind = dm_scan_fdt_dev,
|
|
#endif
|
|
#endif
|
|
.post_probe = i2c_post_probe,
|
|
.post_probe = i2c_post_probe,
|