summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCharlie Mooney <charliemooney@chromium.org>2016-05-02 08:57:17 +0800
committerOlof Johansson <olof@lixom.net>2016-05-11 11:55:48 -0700
commit9e96aa70e9acd03eee61c2094b4755b80a386c47 (patch)
tree9272e5d36fe4ce2bb9e84000fe06b81cad8d2194
parent9bd9a90b013c647ed88ed4fa69b664b770924cf0 (diff)
downloadlinux-stable-9e96aa70e9acd03eee61c2094b4755b80a386c47.tar.gz
linux-stable-9e96aa70e9acd03eee61c2094b4755b80a386c47.tar.bz2
linux-stable-9e96aa70e9acd03eee61c2094b4755b80a386c47.zip
platform/chrome: chromeos_laptop - Add Elan touchpad for Wolf
The upcoming Elan Wolf (Dell Chromebook 11) devices need to know to look for Elan touchpads on the i2c bus so that they will be functional. Based on the chromeos-kernel commit : https://chromium-review.googlesource.com/198283 Signed-off-by: Charlie Mooney <charliemooney@chromium.org> Signed-off-by: Benson Leung <bleung@chromium.org> Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r--drivers/platform/chrome/chromeos_laptop.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/platform/chrome/chromeos_laptop.c b/drivers/platform/chrome/chromeos_laptop.c
index 6ea4f1ad382a..8398a7d96490 100644
--- a/drivers/platform/chrome/chromeos_laptop.c
+++ b/drivers/platform/chrome/chromeos_laptop.c
@@ -461,6 +461,8 @@ static struct chromeos_laptop dell_chromebook_11 = {
.i2c_peripherals = {
/* Touchpad. */
{ .add = setup_cyapa_tp, I2C_ADAPTER_DESIGNWARE_0 },
+ /* Elan Touchpad option. */
+ { .add = setup_elantech_tp, I2C_ADAPTER_DESIGNWARE_0 },
},
};