From: Enric Balletbo i Serra <enric.balletbo@collabora.com>
To: linux-kernel@vger.kernel.org
Cc: gwendal@chromium.org, Guenter Roeck <groeck@chromium.org>,
Benson Leung <bleung@chromium.org>,
Lee Jones <lee.jones@linaro.org>,
kernel@collabora.com, dtor@chromium.org
Subject: [PATCH 10/10] mfd: cros_ec: Add convenience struct to define autodetectable CrOS EC subdevices
Date: Tue, 4 Jun 2019 17:20:19 +0200 [thread overview]
Message-ID: <20190604152019.16100-11-enric.balletbo@collabora.com> (raw)
In-Reply-To: <20190604152019.16100-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>
---
drivers/mfd/cros_ec_dev.c | 132 +++++++++++++++++++++-----------------
1 file changed, 74 insertions(+), 58 deletions(-)
diff --git a/drivers/mfd/cros_ec_dev.c b/drivers/mfd/cros_ec_dev.c
index 6fcfc8f17e03..49e4ab7ebb71 100644
--- a/drivers/mfd/cros_ec_dev.c
+++ b/drivers/mfd/cros_ec_dev.c
@@ -34,6 +34,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,
@@ -52,6 +64,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;
@@ -211,30 +265,6 @@ static void cros_ec_sensors_register(struct cros_ec_dev *ec)
kfree(msg);
}
-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;
@@ -292,42 +322,28 @@ static int ec_device_probe(struct platform_device *pdev)
if (cros_ec_check_features(ec, EC_FEATURE_MOTION_SENSE))
cros_ec_sensors_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_devices(ec->dev, PLATFORM_DEVID_AUTO,
+ cros_subdevices[i].mfd_cells,
+ cros_subdevices[i].num_cells,
+ NULL, 0, NULL);
+ 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-04 15:21 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20190604152019.16100-1-enric.balletbo@collabora.com>
2019-06-04 15:20 ` [PATCH 01/10] mfd / platform: cros_ec: Handle chained ECs as platform devices Enric Balletbo i Serra
2019-06-04 15:20 ` [PATCH 03/10] mfd / platform: cros_ec: Miscellaneous character device to talk with the EC Enric Balletbo i Serra
2019-06-04 15:52 ` Greg Kroah-Hartman
2019-06-04 16:58 ` Ezequiel Garcia
2019-06-04 18:35 ` Greg Kroah-Hartman
2019-06-04 18:39 ` Guenter Roeck
2019-06-04 18:59 ` Greg Kroah-Hartman
2019-06-05 6:48 ` Lee Jones
2019-06-05 8:02 ` Greg Kroah-Hartman
2019-06-05 8:40 ` Lee Jones
2019-06-05 8:48 ` Greg Kroah-Hartman
2019-06-05 9:21 ` Lee Jones
2019-06-06 14:01 ` Ezequiel Garcia
2019-06-06 14:51 ` Greg Kroah-Hartman
2019-06-06 15:12 ` Ezequiel Garcia
2019-06-06 21:11 ` Randy Dunlap
2019-06-10 7:27 ` Lee Jones
2019-06-05 14:33 ` Enric Balletbo Serra
2019-06-04 15:20 ` [PATCH 04/10] mfd: cros_ec: Switch to use the new cros-ec-chardev driver Enric Balletbo i Serra
2019-06-04 15:20 ` [PATCH 05/10] mfd / platform: cros_ec: Rename config to a better name Enric Balletbo i Serra
2019-06-04 15:20 ` [PATCH 06/10] mfd / platform: cros_ec: Reorganize platform and mfd includes Enric Balletbo i Serra
2019-06-05 10:02 ` Mark Brown
2019-06-05 14:20 ` Wolfram Sang
2019-06-05 14:26 ` Neil Armstrong
2019-06-05 16:26 ` Alexandre Belloni
2019-06-08 12:05 ` Jonathan Cameron
2019-06-11 9:20 ` Benjamin Tissoires
2019-06-11 17:10 ` Dmitry Torokhov
2019-06-11 19:54 ` Sebastian Reichel
2019-06-04 15:20 ` [PATCH 07/10] mfd: cros_ec: Update with SPDX Licence identifier and fix description Enric Balletbo i Serra
2019-06-04 15:20 ` [PATCH 08/10] mfd: cros_ec: Use kzalloc and cros_ec_cmd_xfer_status helper Enric Balletbo i Serra
2019-06-04 15:20 ` [PATCH 09/10] mfd: cros_ec: Add convenience struct to define dedicated CrOS EC MCUs Enric Balletbo i Serra
2019-06-04 15:20 ` Enric Balletbo i Serra [this message]
2019-06-14 16:37 ` [PATCH 10/10] mfd: cros_ec: Add convenience struct to define autodetectable CrOS EC subdevices Gwendal Grignou
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=20190604152019.16100-11-enric.balletbo@collabora.com \
--to=enric.balletbo@collabora.com \
--cc=bleung@chromium.org \
--cc=dtor@chromium.org \
--cc=groeck@chromium.org \
--cc=gwendal@chromium.org \
--cc=kernel@collabora.com \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
/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).