Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751375AbbDZBfA (ORCPT ); Sat, 25 Apr 2015 21:35:00 -0400 Received: from mail-vn0-f48.google.com ([209.85.216.48]:33884 "EHLO mail-vn0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751268AbbDZBe6 (ORCPT ); Sat, 25 Apr 2015 21:34:58 -0400 MIME-Version: 1.0 In-Reply-To: <1428336906-14906-4-git-send-email-javier.martinez@collabora.co.uk> References: <1428336906-14906-1-git-send-email-javier.martinez@collabora.co.uk> <1428336906-14906-4-git-send-email-javier.martinez@collabora.co.uk> From: Gwendal Grignou Date: Sat, 25 Apr 2015 18:34:37 -0700 X-Google-Sender-Auth: hhz6vuLmpHj0-Xsa87CSQMQnCBs Message-ID: Subject: Re: [RESEND PATCH 3/8] mfd: cros_ec: Instantiate sub-devices from device tree To: Javier Martinez Canillas Cc: Olof Johansson , Lee Jones , Doug Anderson , Bill Richardson , Simon Glass , Stephen Barber , Filipe Brandenburger , Todd Broch , linux-samsung-soc@vger.kernel.org, Linux Kernel Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2296 Lines: 72 Reviewed-by: Gwendal Grignou Tested-by: Gwendal Grignou On Mon, Apr 6, 2015 at 9:15 AM, Javier Martinez Canillas wrote: > From: Todd Broch > > 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 > Signed-off-by: Javier Martinez Canillas > --- > 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 > #include > #include > #include > @@ -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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/