summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRushikesh S Kadam <rushikesh.s.kadam@intel.com>2019-03-01 13:50:54 +0530
committerLee Jones <lee.jones@linaro.org>2019-05-14 08:13:26 +0100
commitd4cee9509e508df34d1dbfad6b42e5bf907d20fd (patch)
treed84cffc2ca0c11de30f46eee8256acb5c7c07eab /drivers
parent730080a758fdc44fbfc214dd004553ef13d5b89b (diff)
downloadlinux-stable-d4cee9509e508df34d1dbfad6b42e5bf907d20fd.tar.gz
linux-stable-d4cee9509e508df34d1dbfad6b42e5bf907d20fd.tar.bz2
linux-stable-d4cee9509e508df34d1dbfad6b42e5bf907d20fd.zip
mfd: cros_ec: Instantiate properly CrOS ISH MCU device
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: Andy Shevchenko <andriy.shevchenko@intel.com> Acked-by: Enric Balletbo i Serra <enric.balletbo@collabora.com> Reviewed-by: Gwendal Grignou <gwendal@chromium.org> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mfd/cros_ec_dev.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/mfd/cros_ec_dev.c b/drivers/mfd/cros_ec_dev.c
index d275deaecb12..596f124f2a54 100644
--- a/drivers/mfd/cros_ec_dev.c
+++ b/drivers/mfd/cros_ec_dev.c
@@ -419,6 +419,19 @@ static int ec_device_probe(struct platform_device *pdev)
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
* in devtmpfs.