2 files changed, 11 insertions, 0 deletions

diff --git a/drivers/mfd/cros_ec_dev.c b/drivers/mfd/cros_ec_dev.c
index 71a01a096595..54a58df571b6 100644
--- a/drivers/mfd/cros_ec_dev.c
+++ b/drivers/mfd/cros_ec_dev.c
@@ -442,6 +442,16 @@ static int ec_device_probe(struct platform_device *pdev)
                 ec_platform->ec_name = CROS_EC_DEV_ISH_NAME;
         }
 
+        /* Check whether this is actually a Touchpad MCU rather than an EC */
+        if (cros_ec_check_features(ec, EC_FEATURE_TOUCHPAD)) {
+                dev_info(dev, "CrOS Touchpad MCU detected.\n");
+                /*
+                 * Help userspace differentiating ECs from TP MCU,
+                 * regardless of the probing order.
+                 */
+                ec_platform->ec_name = CROS_EC_DEV_TP_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 276079699504..cfa78bb4990f 100644
--- a/include/linux/mfd/cros_ec.h
+++ b/include/linux/mfd/cros_ec.h
@@ -25,6 +25,7 @@
 #define CROS_EC_DEV_NAME "cros_ec"
 #define CROS_EC_DEV_FP_NAME "cros_fp"
 #define CROS_EC_DEV_PD_NAME "cros_pd"
+#define CROS_EC_DEV_TP_NAME "cros_tp"
 #define CROS_EC_DEV_ISH_NAME "cros_ish"
 
 /*