mfd: cros_ec: Instantiate properly CrOS ISH MCU device

[linux-2.6-microblaze.git] / drivers / mfd / cros_ec_dev.c

diff --git a/drivers/mfd/cros_ec_dev.c b/drivers/mfd/cros_ec_dev.c
index d275dea..596f124 100644 (file)
--- a/drivers/mfd/cros_ec_dev.c
+++ b/drivers/mfd/cros_ec_dev.c
@@ -418,6 +418,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