diff options
| author | Benson Leung <bleung@chromium.org> | 2013-02-21 12:14:59 -0800 |
|---|---|---|
| committer | Matthew Garrett <matthew.garrett@nebula.com> | 2013-02-27 08:30:44 -0500 |
| commit | 8e1ad4c4bf7b99b495625433a1fcc2b566caa222 (patch) | |
| tree | 7aaabf6c42c5f7426f4df9e114a8aa023f949f24 | |
| parent | c165b80cfecc5f253e93ebd133f7c53cf81d82d5 (diff) | |
| download | op-kernel-dev-8e1ad4c4bf7b99b495625433a1fcc2b566caa222.zip op-kernel-dev-8e1ad4c4bf7b99b495625433a1fcc2b566caa222.tar.gz | |
Platform: x86: chromeos_laptop - Add Pixel Trackpad
Instantiate the atmel mxt224s trackpad on this system.
The trackpad may appear at two possible addresses:
0x4b in operational mode.
0x25 in bootloader mode.
Signed-off-by: Benson Leung <bleung@chromium.org>
Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
| -rw-r--r-- | drivers/platform/x86/chromeos_laptop.c | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/drivers/platform/x86/chromeos_laptop.c b/drivers/platform/x86/chromeos_laptop.c index bc6599c..577e64d 100644 --- a/drivers/platform/x86/chromeos_laptop.c +++ b/drivers/platform/x86/chromeos_laptop.c @@ -25,6 +25,8 @@ #include <linux/i2c.h> #include <linux/module.h> +#define ATMEL_TP_I2C_ADDR 0x4b +#define ATMEL_TP_I2C_BL_ADDR 0x25 #define CYAPA_TP_I2C_ADDR 0x67 #define ISL_ALS_I2C_ADDR 0x44 #define TAOS_ALS_I2C_ADDR 0x29 @@ -58,6 +60,12 @@ static struct i2c_board_info __initdata tsl2563_als_device = { I2C_BOARD_INFO("tsl2563", TAOS_ALS_I2C_ADDR), }; +static struct i2c_board_info __initdata atmel_224s_tp_device = { + I2C_BOARD_INFO("atmel_mxt_tp", ATMEL_TP_I2C_ADDR), + .platform_data = NULL, + .flags = I2C_CLIENT_WAKE, +}; + static struct i2c_client __init *__add_probed_i2c_device( const char *name, int bus, @@ -161,6 +169,19 @@ static int __init setup_cyapa_smbus_tp(const struct dmi_system_id *id) return 0; } +static int __init setup_atmel_224s_tp(const struct dmi_system_id *id) +{ + const unsigned short addr_list[] = { ATMEL_TP_I2C_BL_ADDR, + ATMEL_TP_I2C_ADDR, + I2C_CLIENT_END }; + + /* add atmel mxt touchpad on VGA DDC GMBus */ + tp = add_probed_i2c_device("trackpad", I2C_ADAPTER_VGADDC, + &atmel_224s_tp_device, addr_list); + return 0; +} + + static int __init setup_isl29018_als(const struct dmi_system_id *id) { /* add isl29018 light sensor */ @@ -192,6 +213,14 @@ static struct dmi_system_id __initdata chromeos_laptop_dmi_table[] = { .callback = setup_cyapa_smbus_tp, }, { + .ident = "Chromebook Pixel - Touchpad", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "GOOGLE"), + DMI_MATCH(DMI_PRODUCT_NAME, "Link"), + }, + .callback = setup_atmel_224s_tp, + }, + { .ident = "Samsung Series 5 550 - Light Sensor", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG"), |
