From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161064AbbCLRFA (ORCPT ); Thu, 12 Mar 2015 13:05:00 -0400 Received: from bhuna.collabora.co.uk ([93.93.135.160]:46853 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030191AbbCLRD1 (ORCPT ); Thu, 12 Mar 2015 13:03:27 -0400 From: Javier Martinez Canillas To: Olof Johansson Cc: Lee Jones , Doug Anderson , Bill Richardson , Simon Glass , Gwendal Grignou , Stephen Barber , Todd Broch , linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, Javier Martinez Canillas Subject: [PATCH 4/8] mfd: cros_ec: Instantiate sub-devices from device tree Date: Thu, 12 Mar 2015 18:02:44 +0100 Message-Id: <1426179768-27482-5-git-send-email-javier.martinez@collabora.co.uk> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1426179768-27482-1-git-send-email-javier.martinez@collabora.co.uk> References: <1426179768-27482-1-git-send-email-javier.martinez@collabora.co.uk> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 07c53c27c82a..9da95cc0a1ee 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 @@ -123,18 +124,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, }, }; @@ -164,6 +155,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