[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20190408094141.27858-3-enric.balletbo@collabora.com>
Date: Mon, 8 Apr 2019 11:41:39 +0200
From: Enric Balletbo i Serra <enric.balletbo@...labora.com>
To: lee.jones@...aro.org
Cc: gwendal@...omium.org, bleung@...omium.org,
linux-kernel@...r.kernel.org, groeck@...omium.org,
kernel@...labora.com, dtor@...omium.org,
rushikesh.s.kadam@...el.com,
Andy Shevchenko <andriy.shevchenko@...el.com>
Subject: [PATCH v3 2/4] mfd: cros_ec: instantiate properly CrOS ISH MCU device
From: Rushikesh S Kadam <rushikesh.s.kadam@...el.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@...el.com>
Reviewed-by: Gwendal Grignou <gwendal@...omium.org>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@...el.com>
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@...labora.com>
---
Changes in v3:
- Fix Andy Shevchenko email.
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
Powered by blists - more mailing lists