[v3,2/4] mfd: cros_ec: instantiate properly CrOS ISH MCU device
diff mbox series

Message ID 20190408094141.27858-3-enric.balletbo@collabora.com
State New
Headers show
Series
  • mfd: cros_ec: Instantiate CrOS FP, TP and ISH devices
Related show

Commit Message

Enric Balletbo i Serra April 8, 2019, 9:41 a.m. UTC
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 <andriy.shevchenko@intel.com>
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.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(-)

Comments

Andy Shevchenko April 8, 2019, 10:28 a.m. UTC | #1
On Mon, Apr 08, 2019 at 11:41:39AM +0200, Enric Balletbo i Serra wrote:
> 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'.

> Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com>

> Changes in v3:
> - Fix Andy Shevchenko email.

I'm not sure what it means.
I'm using @linux.intel.com for OSS work.
Enric Balletbo i Serra April 8, 2019, 10:39 a.m. UTC | #2
On 8/4/19 12:28, Andy Shevchenko wrote:
> On Mon, Apr 08, 2019 at 11:41:39AM +0200, Enric Balletbo i Serra wrote:
>> 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'.
> 
>> Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com>
> 
>> Changes in v3:
>> - Fix Andy Shevchenko email.
> 

The fix was s/andry/andriy/ For some reason I missed an 'i' in your name and the
email obviously bounced for your address.

> I'm not sure what it means.
> I'm using @linux.intel.com for OSS work.
> 

Seems that you used andriy.shevchenko@intel.com instead, see:

https://lore.kernel.org/patchwork/patch/1047022/

The part that says:

FWIW,
Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com>
Andy Shevchenko April 8, 2019, 12:39 p.m. UTC | #3
On Mon, Apr 08, 2019 at 12:39:48PM +0200, Enric Balletbo i Serra wrote:
> On 8/4/19 12:28, Andy Shevchenko wrote:
> > On Mon, Apr 08, 2019 at 11:41:39AM +0200, Enric Balletbo i Serra wrote:
> >> 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'.
> > 
> >> Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com>
> > 
> >> Changes in v3:
> >> - Fix Andy Shevchenko email.
> > 
> 
> The fix was s/andry/andriy/ For some reason I missed an 'i' in your name and the
> email obviously bounced for your address.
> 
> > I'm not sure what it means.
> > I'm using @linux.intel.com for OSS work.
> > 
> 
> Seems that you used andriy.shevchenko@intel.com instead, see:

Oh, that's my mistake. I guess, the original mail had my @intel.com instead of
@linux.intel.com and I blindly copied that.

> 
> https://lore.kernel.org/patchwork/patch/1047022/
> 
> The part that says:
> 
> FWIW,
> Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com>

Patch
diff mbox series

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