From: Enric Balletbo i Serra <enric.balletbo@collabora.com>
To: lee.jones@linaro.org
Cc: gwendal@chromium.org, bleung@chromium.org,
linux-kernel@vger.kernel.org, groeck@chromium.org,
kernel@collabora.com, dtor@chromium.org,
rushikesh.s.kadam@intel.com,
Andy Shevchenko <andry.shevchenko@intel.com>
Subject: [PATCH v2 2/4] mfd: cros_ec: instantiate properly CrOS ISH MCU device
Date: Fri, 5 Apr 2019 19:33:22 +0200 [thread overview]
Message-ID: <20190405173324.22118-3-enric.balletbo@collabora.com> (raw)
In-Reply-To: <20190405173324.22118-1-enric.balletbo@collabora.com>
From: Rushikesh S Kadam <rushikesh.s.kadam@intel.com>
Integrated Sensor Hub (ISH) is also a MCU running EC
having feature bit EC_FEATURE_ISH. Instantiate it as
a special CrOS EC device with device name 'cros_ish'.
Signed-off-by: Rushikesh S Kadam <rushikesh.s.kadam@intel.com>
Reviewed-by: Gwendal Grignou <gwendal@chromium.org>
Reviewed-by: Andy Shevchenko <andry.shevchenko@intel.com>
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
---
Changes in v2:
- Add a patch to instantiate the CrOS ISH device to the series.
drivers/mfd/cros_ec_dev.c | 13 +++++++++++++
include/linux/mfd/cros_ec.h | 5 +++--
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/drivers/mfd/cros_ec_dev.c b/drivers/mfd/cros_ec_dev.c
index 99cfdb5b71ef..1daccd4e05a3 100644
--- a/drivers/mfd/cros_ec_dev.c
+++ b/drivers/mfd/cros_ec_dev.c
@@ -636,6 +636,19 @@ static int ec_device_probe(struct platform_device *pdev)
device_initialize(&ec->class_dev);
cdev_init(&ec->cdev, &fops);
+ /*
+ * Check whether this is actually an Integrated Sensor Hub (ISH)
+ * rather than an EC.
+ */
+ if (cros_ec_check_features(ec, EC_FEATURE_ISH)) {
+ dev_info(dev, "CrOS ISH MCU detected.\n");
+ /*
+ * Help userspace differentiating ECs from ISH MCU,
+ * regardless of the probing order.
+ */
+ ec_platform->ec_name = CROS_EC_DEV_ISH_NAME;
+ }
+
/*
* Add the class device
* Link to the character device for creating the /dev entry
diff --git a/include/linux/mfd/cros_ec.h b/include/linux/mfd/cros_ec.h
index b6442201f77f..ce50628aa5e7 100644
--- a/include/linux/mfd/cros_ec.h
+++ b/include/linux/mfd/cros_ec.h
@@ -22,8 +22,9 @@
#include <linux/mfd/cros_ec_commands.h>
#include <linux/mutex.h>
-#define CROS_EC_DEV_NAME "cros_ec"
-#define CROS_EC_DEV_PD_NAME "cros_pd"
+#define CROS_EC_DEV_NAME "cros_ec"
+#define CROS_EC_DEV_ISH_NAME "cros_ish"
+#define CROS_EC_DEV_PD_NAME "cros_pd"
/*
* The EC is unresponsive for a time after a reboot command. Add a
--
2.20.1
next prev parent reply other threads:[~2019-04-05 17:33 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-05 17:33 [PATCH v2 0/4] mfd: cros_ec: Instantiate CrOS FP, TP and ISH devices Enric Balletbo i Serra
2019-04-05 17:33 ` [PATCH v2 1/4] mfd: cros_ec: Update the EC feature codes Enric Balletbo i Serra
2019-04-05 17:33 ` Enric Balletbo i Serra [this message]
2019-04-05 17:33 ` [PATCH v2 3/4] mfd: cros_ec: instantiate properly CrOS FP MCU device Enric Balletbo i Serra
2019-04-05 17:33 ` [PATCH v2 4/4] mfd: cros_ec: instantiate properly CrOS Touchpad " 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=20190405173324.22118-3-enric.balletbo@collabora.com \
--to=enric.balletbo@collabora.com \
--cc=andry.shevchenko@intel.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 \
--cc=rushikesh.s.kadam@intel.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).