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 <tbr...@chromium.org>
> >>
> >> 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 <tbr...@chromium.org>
> >> Signed-off-by: Javier Martinez Canillas <javier.marti...@collabora.co.uk>
> >> ---
> >> 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,
> >
> > 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 majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
