Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753272AbbETLa6 (ORCPT ); Wed, 20 May 2015 07:30:58 -0400 Received: from mail-wi0-f169.google.com ([209.85.212.169]:36900 "EHLO mail-wi0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753114AbbETLa5 (ORCPT ); Wed, 20 May 2015 07:30:57 -0400 Date: Wed, 20 May 2015 12:30:52 +0100 From: Lee Jones To: Javier Martinez Canillas Cc: Samuel Ortiz , Olof Johansson , Doug Anderson , Bill Richardson , Simon Glass , Gwendal Grignou , Stephen Barber , Filipe Brandenburger , Todd Broch , Alexandru M Stan , Heiko Stuebner , linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/2] mfd: cros_ec: Instantiate sub-devices from device tree Message-ID: <20150520113052.GH3627@x1> References: <1432114288-24669-1-git-send-email-javier.martinez@collabora.co.uk> <1432114288-24669-3-git-send-email-javier.martinez@collabora.co.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1432114288-24669-3-git-send-email-javier.martinez@collabora.co.uk> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2678 Lines: 89 On Wed, 20 May 2015, 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 > Tested-by: Heiko Stuebner > Reviewed-by: Gwendal Grignou > Tested-by: Gwendal Grignou > Acked-by: Lee Jones > --- > > Changes since v2: > - Added Lee Jones Acked-by tag. > > Changes since v1: > - Added Heiko Stuebner and Gwendal Grignou Tested-by tag > - Added Gwendal Grignou Reviewed-by tag > - Use automatic device ID instead of 1 as suggested by Lee Jones > - Remove #ifdeffery and check for of_node to register sub-devices > Suggested by Lee Jones > --- > drivers/mfd/cros_ec.c | 22 +++++++++++----------- > 1 file changed, 11 insertions(+), 11 deletions(-) Applied, thanks. > diff --git a/drivers/mfd/cros_ec.c b/drivers/mfd/cros_ec.c > index c4aecc6f8373..1574a9352a6d 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 = PLATFORM_DEVID_AUTO, > }, > }; > > @@ -150,6 +141,15 @@ int cros_ec_register(struct cros_ec_device *ec_dev) > return err; > } > > + if (IS_ENABLED(CONFIG_OF) && dev->of_node) { > + 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; > + } > + } > + > dev_info(dev, "Chrome EC device registered\n"); > > return 0; -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog -- 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/