Re: [RESEND PATCH 3/8] mfd: cros_ec: Instantiate sub-devices from device tree

[Gwendal Grignou]

Reviewed-by: Gwendal Grignou <gwendal@xxxxxxxxxxxx>
Tested-by: Gwendal Grignou <gwendal@xxxxxxxxxxxx>

On Mon, Apr 6, 2015 at 9:15 AM, Javier Martinez Canillas
<javier.martinez@xxxxxxxxxxxxxxx> wrote:
> From: Todd Broch <tbroch@xxxxxxxxxxxx>
>
> If the EC device tree node has sub-nodes, try to instantiate them as
> MFD sub-devices.  We can configure the EC features provided by the board.
>
> Signed-off-by: Todd Broch <tbroch@xxxxxxxxxxxx>
> Signed-off-by: Javier Martinez Canillas <javier.martinez@xxxxxxxxxxxxxxx>
> ---
>  drivers/mfd/cros_ec.c | 22 +++++++++++-----------
>  1 file changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/mfd/cros_ec.c b/drivers/mfd/cros_ec.c
> index c4aecc6f8373..8aa83b91e25c 100644
> --- a/drivers/mfd/cros_ec.c
> +++ b/drivers/mfd/cros_ec.c
> @@ -17,6 +17,7 @@
>   * battery charging and regulator control, firmware update.
>   */
>
> +#include <linux/of_platform.h>
>  #include <linux/interrupt.h>
>  #include <linux/slab.h>
>  #include <linux/module.h>
> @@ -109,18 +110,8 @@ EXPORT_SYMBOL(cros_ec_cmd_xfer);
>
>  static const struct mfd_cell cros_devs[] = {
>         {
> -               .name = "cros-ec-keyb",
> -               .id = 1,
> -               .of_compatible = "google,cros-ec-keyb",
> -       },
> -       {
> -               .name = "cros-ec-i2c-tunnel",
> -               .id = 2,
> -               .of_compatible = "google,cros-ec-i2c-tunnel",
> -       },
> -       {
>                 .name = "cros-ec-ctl",
> -               .id = 3,
> +               .id = 1,
>         },
>  };
>
> @@ -150,6 +141,15 @@ int cros_ec_register(struct cros_ec_device *ec_dev)
>                 return err;
>         }
>
> +#ifdef CONFIG_OF
> +       err = of_platform_populate(dev->of_node, NULL, NULL, dev);
> +       if (err) {
> +               mfd_remove_devices(dev);
> +               dev_err(dev, "Failed to register sub-devices\n");
> +               return err;
> +       }
> +#endif
> +
>         dev_info(dev, "Chrome EC device registered\n");
>
>         return 0;
> --
> 2.1.4
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/