[U-Boot] [PATCH 03/14] drivers: i2c: uclass: parse dt parameters only when CONFIG_OF_CONTROL is enable

[Simon Glass]

Hi Mugunthan,

On 18 July 2016 at 03:40, Mugunthan V N <mugunthanvnm at ti.com> wrote:
> parse dt parameter of i2c devices only when CONFIG_OF_CONTROL
> is enabled.
>
> Signed-off-by: Mugunthan V N <mugunthanvnm at ti.com>
> ---
>  drivers/i2c/i2c-uclass.c | 14 ++++++++++++++
>  1 file changed, 14 insertions(+)

Reviewed-by: Simon Glass <sjg at chromium.org>

Please see below.

>
> 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);

The above should be moved into i2c_chip_ofdata_to_platdata(), which
will only be called if there is a device tree.

>
>         return dm_i2c_set_bus_speed(dev, i2c->speed_hz);

I'm not sure about this one. In principle there should be a value
i2c->speed_hz even if OF_CONTROL is not used. But I suppose it's OK to
retain this #ifdef.

> +#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) = {
> --
> 2.9.1.200.gb1ec08f
>

Regards,
Simon