Platform: x86: chromeos_laptop - Add Pixel Touchscreen

Instantiate the atmel mxt1664s touchscreen on this system.
The touchscreen may appear at two possible addresses:
0x4a in operational mode.
0x26 in bootloader mode.

Signed-off-by: Yufeng Shen <miletus@chromium.org>
Signed-off-by: Benson Leung <bleung@chromium.org>
Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>

1 files changed, 31 insertions, 0 deletions

diff --git a/drivers/platform/x86/chromeos_laptop.c b/drivers/platform/x86/chromeos_laptop.c
index c13f0c5e282a..e5380e772b26 100644
--- a/drivers/platform/x86/chromeos_laptop.c
+++ b/drivers/platform/x86/chromeos_laptop.c
@@ -27,12 +27,15 @@
 
 #define ATMEL_TP_I2C_ADDR       0x4b
 #define ATMEL_TP_I2C_BL_ADDR    0x25
+#define ATMEL_TS_I2C_ADDR       0x4a
+#define ATMEL_TS_I2C_BL_ADDR    0x26
 #define CYAPA_TP_I2C_ADDR       0x67
 #define ISL_ALS_I2C_ADDR        0x44
 #define TAOS_ALS_I2C_ADDR       0x29
 
 static struct i2c_client *als;
 static struct i2c_client *tp;
+static struct i2c_client *ts;
 
 const char *i2c_adapter_names[] = {
         "SMBus I801 adapter",
@@ -66,6 +69,12 @@ static struct i2c_board_info __initdata atmel_224s_tp_device = {
         .flags          = I2C_CLIENT_WAKE,
 };
 
+static struct i2c_board_info __initdata atmel_1664s_device = {
+        I2C_BOARD_INFO("atmel_mxt_ts", ATMEL_TS_I2C_ADDR),
+        .platform_data = NULL,
+        .flags          = I2C_CLIENT_WAKE,
+};
+
 static struct i2c_client __init *__add_probed_i2c_device(
                 const char *name,
                 int bus,
@@ -201,6 +210,18 @@ static int __init setup_atmel_224s_tp(const struct dmi_system_id *id)
         return 0;
 }
 
+static int __init setup_atmel_1664s_ts(const struct dmi_system_id *id)
+{
+        const unsigned short addr_list[] = { ATMEL_TS_I2C_BL_ADDR,
+                                             ATMEL_TS_I2C_ADDR,
+                                             I2C_CLIENT_END };
+
+        /* add atmel mxt touch device on PANEL GMBus */
+        ts = add_probed_i2c_device("touchscreen", I2C_ADAPTER_PANEL,
+                                   &atmel_1664s_device, addr_list);
+        return 0;
+}
+
 
 static int __init setup_isl29018_als(const struct dmi_system_id *id)
 {
@@ -233,6 +254,14 @@ static struct dmi_system_id __initdata chromeos_laptop_dmi_table[] = {
                 .callback = setup_cyapa_smbus_tp,
         },
         {
+                .ident = "Chromebook Pixel - Touchscreen",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "GOOGLE"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Link"),
+                },
+                .callback = setup_atmel_1664s_ts,
+        },
+        {
                 .ident = "Chromebook Pixel - Touchpad",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "GOOGLE"),
@@ -302,6 +331,8 @@ static void __exit chromeos_laptop_exit(void)
                 i2c_unregister_device(als);
         if (tp)
                 i2c_unregister_device(tp);
+        if (ts)
+                i2c_unregister_device(ts);
 }
 
 module_init(chromeos_laptop_init);