Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757971AbbEEKxh (ORCPT ); Tue, 5 May 2015 06:53:37 -0400 Received: from mail-wi0-f173.google.com ([209.85.212.173]:35631 "EHLO mail-wi0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757955AbbEEKx3 (ORCPT ); Tue, 5 May 2015 06:53:29 -0400 Date: Tue, 5 May 2015 11:53:24 +0100 From: Lee Jones To: Javier Martinez Canillas Cc: Olof Johansson , Doug Anderson , Bill Richardson , Simon Glass , Gwendal Grignou , Stephen Barber , Filipe Brandenburger , Todd Broch , linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [RESEND PATCH 3/8] mfd: cros_ec: Instantiate sub-devices from device tree Message-ID: <20150505105324.GA4047@x1> References: <1428336906-14906-1-git-send-email-javier.martinez@collabora.co.uk> <1428336906-14906-4-git-send-email-javier.martinez@collabora.co.uk> <20150429103943.GV9169@x1> <55488BA6.9030500@collabora.co.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <55488BA6.9030500@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: 2895 Lines: 103 On Tue, 05 May 2015, Javier Martinez Canillas wrote: > Hello Lee, > > On 04/29/2015 12:39 PM, Lee Jones wrote: > > On Mon, 06 Apr 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 > >> --- > >> 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, > > > > Can't you use PLATFORM_DEVID_AUTO? > > > > Yes, I think that will work as well so I'll change it. > > >> }, > >> }; > >> > >> @@ -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 > > > > And if we don't support OF? > > > > These sub-devices are only present on machines that support OF so > is more flexible to use of_platform_populate() to register those. > > Both machines using and not using DT, register a cros-ec-ctl which > is still a mfd_cell in the cros_devs array. I'm not really a fan of #ifdiffery if it can be avoided. How about? if (np) cros_ec_of_register(); > >> dev_info(dev, "Chrome EC device registered\n"); > >> > >> return 0; > > > > Best regards, > Javier -- 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/