From: Enric Balletbo i Serra <enric.balletbo@collabora.com>
To: linux-kernel@vger.kernel.org
Cc: Jonathan Corbet <corbet@lwn.net>,
Krzysztof Kozlowski <krzk@kernel.org>,
Will Deacon <will.deacon@arm.com>,
MyungJoo Ham <myungjoo.ham@samsung.com>,
Chanwoo Choi <cw00.choi@samsung.com>,
Benson Leung <bleung@chromium.org>,
Guenter Roeck <groeck@chromium.org>,
Jonathan Cameron <jic23@kernel.org>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Lee Jones <lee.jones@linaro.org>,
Sebastian Reichel <sre@kernel.org>,
Thierry Reding <thierry.reding@gmail.com>,
Alexandre Belloni <alexandre.belloni@bootlin.com>,
Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>,
Neil Armstrong <narmstrong@baylibre.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Collabora kernel ML <kernel@collabora.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Gwendal Grignou <gwendal@chromium.org>
Subject: [PATCH v4 09/11] mfd: cros_ec: Add convenience struct to define autodetectable CrOS EC subdevices
Date: Thu, 27 Jun 2019 12:40:37 +0200 [thread overview]
Message-ID: <20190627104039.26285-10-enric.balletbo@collabora.com> (raw)
In-Reply-To: <20190627104039.26285-1-enric.balletbo@collabora.com>
The CrOS EC is gaining lots of subdevices that are autodetectable by
sending the EC_FEATURE_GET_CMD, it takes fair amount of boiler plate
code to add those devices. So, add a struct that can be used to quickly
add new subdevices without having to duplicate code.
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Tested-by: Gwendal Grignou <gwendal@chromium.org>
---
Changes in v4: None
Changes in v3:
- Use mfd_add_hotplug_devices helper (Gwendal)
Changes in v2: None
drivers/mfd/cros_ec_dev.c | 131 +++++++++++++++++++++-----------------
1 file changed, 73 insertions(+), 58 deletions(-)
diff --git a/drivers/mfd/cros_ec_dev.c b/drivers/mfd/cros_ec_dev.c
index 72799331d804..73f186b9fda8 100644
--- a/drivers/mfd/cros_ec_dev.c
+++ b/drivers/mfd/cros_ec_dev.c
@@ -46,6 +46,18 @@ struct cros_feature_to_name {
const char *desc;
};
+/**
+ * cros_feature_to_cells - CrOS feature id to mfd cells association.
+ * @id: The feature identifier.
+ * @mfd_cells: Pointer to the array of mfd cells that needs to be added.
+ * @num_cells: Number of mfd cells into the array.
+ */
+struct cros_feature_to_cells {
+ unsigned int id;
+ const struct mfd_cell *mfd_cells;
+ unsigned int num_cells;
+};
+
static const struct cros_feature_to_name cros_mcu_devices[] = {
{
.id = EC_FEATURE_FINGERPRINT,
@@ -69,6 +81,48 @@ static const struct cros_feature_to_name cros_mcu_devices[] = {
},
};
+static const struct mfd_cell cros_ec_cec_cells[] = {
+ { .name = "cros-ec-cec", },
+};
+
+static const struct mfd_cell cros_ec_rtc_cells[] = {
+ { .name = "cros-ec-rtc", },
+};
+
+static const struct mfd_cell cros_usbpd_charger_cells[] = {
+ { .name = "cros-usbpd-charger", },
+ { .name = "cros-usbpd-logger", },
+};
+
+static const struct cros_feature_to_cells cros_subdevices[] = {
+ {
+ .id = EC_FEATURE_CEC,
+ .mfd_cells = cros_ec_cec_cells,
+ .num_cells = ARRAY_SIZE(cros_ec_cec_cells),
+ },
+ {
+ .id = EC_FEATURE_RTC,
+ .mfd_cells = cros_ec_rtc_cells,
+ .num_cells = ARRAY_SIZE(cros_ec_rtc_cells),
+ },
+ {
+ .id = EC_FEATURE_USB_PD,
+ .mfd_cells = cros_usbpd_charger_cells,
+ .num_cells = ARRAY_SIZE(cros_usbpd_charger_cells),
+ },
+};
+
+static const struct mfd_cell cros_ec_platform_cells[] = {
+ { .name = "cros-ec-chardev", },
+ { .name = "cros-ec-debugfs", },
+ { .name = "cros-ec-lightbar", },
+ { .name = "cros-ec-sysfs", },
+};
+
+static const struct mfd_cell cros_ec_vbc_cells[] = {
+ { .name = "cros-ec-vbc", }
+};
+
static int cros_ec_check_features(struct cros_ec_dev *ec, int feature)
{
struct cros_ec_command *msg;
@@ -294,30 +348,6 @@ static void cros_ec_accel_legacy_register(struct cros_ec_dev *ec)
dev_err(ec_dev->dev, "failed to add EC sensors\n");
}
-static const struct mfd_cell cros_ec_cec_cells[] = {
- { .name = "cros-ec-cec" }
-};
-
-static const struct mfd_cell cros_ec_rtc_cells[] = {
- { .name = "cros-ec-rtc" }
-};
-
-static const struct mfd_cell cros_usbpd_charger_cells[] = {
- { .name = "cros-usbpd-charger" },
- { .name = "cros-usbpd-logger" },
-};
-
-static const struct mfd_cell cros_ec_platform_cells[] = {
- { .name = "cros-ec-chardev" },
- { .name = "cros-ec-debugfs" },
- { .name = "cros-ec-lightbar" },
- { .name = "cros-ec-sysfs" },
-};
-
-static const struct mfd_cell cros_ec_vbc_cells[] = {
- { .name = "cros-ec-vbc" }
-};
-
static int ec_device_probe(struct platform_device *pdev)
{
int retval = -ENOMEM;
@@ -378,42 +408,27 @@ static int ec_device_probe(struct platform_device *pdev)
/* Workaroud for older EC firmware */
cros_ec_accel_legacy_register(ec);
- /* Check whether this EC instance has CEC host command support */
- if (cros_ec_check_features(ec, EC_FEATURE_CEC)) {
- retval = mfd_add_devices(ec->dev, PLATFORM_DEVID_AUTO,
- cros_ec_cec_cells,
- ARRAY_SIZE(cros_ec_cec_cells),
- NULL, 0, NULL);
- if (retval)
- dev_err(ec->dev,
- "failed to add cros-ec-cec device: %d\n",
- retval);
- }
-
- /* Check whether this EC instance has RTC host command support */
- if (cros_ec_check_features(ec, EC_FEATURE_RTC)) {
- retval = mfd_add_devices(ec->dev, PLATFORM_DEVID_AUTO,
- cros_ec_rtc_cells,
- ARRAY_SIZE(cros_ec_rtc_cells),
- NULL, 0, NULL);
- if (retval)
- dev_err(ec->dev,
- "failed to add cros-ec-rtc device: %d\n",
- retval);
- }
-
- /* Check whether this EC instance has the PD charge manager */
- if (cros_ec_check_features(ec, EC_FEATURE_USB_PD)) {
- retval = mfd_add_devices(ec->dev, PLATFORM_DEVID_AUTO,
- cros_usbpd_charger_cells,
- ARRAY_SIZE(cros_usbpd_charger_cells),
- NULL, 0, NULL);
- if (retval)
- dev_err(ec->dev,
- "failed to add cros-usbpd-charger device: %d\n",
- retval);
+ /*
+ * The following subdevices can be detected by sending the
+ * EC_FEATURE_GET_CMD Embedded Controller device.
+ */
+ for (i = 0; i < ARRAY_SIZE(cros_subdevices); i++) {
+ if (cros_ec_check_features(ec, cros_subdevices[i].id)) {
+ retval = mfd_add_hotplug_devices(ec->dev,
+ cros_subdevices[i].mfd_cells,
+ cros_subdevices[i].num_cells);
+ if (retval)
+ dev_err(ec->dev,
+ "failed to add %s subdevice: %d\n",
+ cros_subdevices[i].mfd_cells->name,
+ retval);
+ }
}
+ /*
+ * The following subdevices cannot be detected by sending the
+ * EC_FEATURE_GET_CMD to the Embedded Controller device.
+ */
retval = mfd_add_devices(ec->dev, PLATFORM_DEVID_AUTO,
cros_ec_platform_cells,
ARRAY_SIZE(cros_ec_platform_cells),
--
2.20.1
next prev parent reply other threads:[~2019-06-27 10:41 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-27 10:40 [PATCH v4 00/11] Move part of cros-ec out of MFD subsystem Enric Balletbo i Serra
2019-06-27 10:40 ` [PATCH v4 01/11] mfd / platform: cros_ec: Handle chained ECs as platform devices Enric Balletbo i Serra
2019-06-29 7:57 ` Gwendal Grignou
2019-06-27 10:40 ` [PATCH v4 02/11] mfd / platform: cros_ec: Move cros-ec core driver out from MFD Enric Balletbo i Serra
2019-06-27 10:40 ` [PATCH v4 03/11] mfd / platform: cros_ec: Miscellaneous character device to talk with the EC Enric Balletbo i Serra
2019-07-15 17:08 ` Gwendal Grignou
2019-07-16 10:05 ` Enric Balletbo i Serra
2019-06-27 10:40 ` [PATCH v4 04/11] mfd: cros_ec: Switch to use the new cros-ec-chardev driver Enric Balletbo i Serra
2019-06-27 10:40 ` [PATCH v4 05/11] mfd / platform: cros_ec: Rename config to a better name Enric Balletbo i Serra
2019-06-27 10:40 ` [PATCH v4 06/11] mfd / platform: cros_ec: Reorganize platform and mfd includes Enric Balletbo i Serra
2019-06-27 10:40 ` [PATCH v4 07/11] mfd: cros_ec: Use kzalloc and cros_ec_cmd_xfer_status helper Enric Balletbo i Serra
2019-06-27 10:40 ` [PATCH v4 08/11] mfd: cros_ec: Add convenience struct to define dedicated CrOS EC MCUs Enric Balletbo i Serra
2019-06-27 10:40 ` Enric Balletbo i Serra [this message]
2019-06-27 10:40 ` [PATCH v4 10/11] mfd: cros_ec: Use mfd_add_hotplug_devices() helper Enric Balletbo i Serra
2019-06-27 10:40 ` [PATCH v4 11/11] arm/arm64: defconfig: Update configs to use the new CROS_EC options Enric Balletbo i Serra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190627104039.26285-10-enric.balletbo@collabora.com \
--to=enric.balletbo@collabora.com \
--cc=alexandre.belloni@bootlin.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=bleung@chromium.org \
--cc=broonie@kernel.org \
--cc=corbet@lwn.net \
--cc=cw00.choi@samsung.com \
--cc=dmitry.torokhov@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=groeck@chromium.org \
--cc=gwendal@chromium.org \
--cc=jic23@kernel.org \
--cc=kernel@collabora.com \
--cc=krzk@kernel.org \
--cc=lee.jones@linaro.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=myungjoo.ham@samsung.com \
--cc=narmstrong@baylibre.com \
--cc=sre@kernel.org \
--cc=thierry.reding@gmail.com \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).