* [PATCH 1/4] Platform: x86: chromeos_laptop - Rename setup_lumpy_tp to setup_cyapa_smbus_tp
2013-02-01 22:34 [PATCH 0/4] Platform: x86: chromeos_laptop - Add more x86 Chromebooks Benson Leung
@ 2013-02-01 22:34 ` Benson Leung
2013-02-01 22:34 ` [PATCH 2/4] Platform: x86: chromeos_laptop - Add Acer C7 trackpad Benson Leung
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Benson Leung @ 2013-02-01 22:34 UTC (permalink / raw)
To: matthew.garrett, platform-driver-x86, linux-kernel; +Cc: bleung, olofj, olof
The Cypress trackpad on smbus is used on other systems
as well. Lets make the name more generic.
Signed-off-by: Benson Leung <bleung@chromium.org>
---
drivers/platform/x86/chromeos_laptop.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/platform/x86/chromeos_laptop.c b/drivers/platform/x86/chromeos_laptop.c
index a8329c3..6440d22 100644
--- a/drivers/platform/x86/chromeos_laptop.c
+++ b/drivers/platform/x86/chromeos_laptop.c
@@ -145,7 +145,7 @@ static struct i2c_client __init *add_smbus_device(const char *name,
addr_list);
}
-static int __init setup_lumpy_tp(const struct dmi_system_id *id)
+static int __init setup_cyapa_smbus_tp(const struct dmi_system_id *id)
{
/* add cyapa touchpad on smbus */
tp = add_smbus_device("trackpad", &cyapa_device);
@@ -166,7 +166,7 @@ static struct dmi_system_id __initdata chromeos_laptop_dmi_table[] = {
DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG"),
DMI_MATCH(DMI_PRODUCT_NAME, "Lumpy"),
},
- .callback = setup_lumpy_tp,
+ .callback = setup_cyapa_smbus_tp,
},
{
.ident = "Samsung Series 5 550 - Light Sensor",
--
1.8.1
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 2/4] Platform: x86: chromeos_laptop - Add Acer C7 trackpad
2013-02-01 22:34 [PATCH 0/4] Platform: x86: chromeos_laptop - Add more x86 Chromebooks Benson Leung
2013-02-01 22:34 ` [PATCH 1/4] Platform: x86: chromeos_laptop - Rename setup_lumpy_tp to setup_cyapa_smbus_tp Benson Leung
@ 2013-02-01 22:34 ` Benson Leung
2013-02-01 22:34 ` [PATCH 3/4] Platform: x86: chromeos_laptop - Add Taos tsl2563 device Benson Leung
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Benson Leung @ 2013-02-01 22:34 UTC (permalink / raw)
To: matthew.garrett, platform-driver-x86, linux-kernel; +Cc: bleung, olofj, olof
Add support for the Acer C7's trackpad, which is a reuse
of the Samsung Series 5 550 trackpad.
Signed-off-by: Benson Leung <bleung@chromium.org>
---
drivers/platform/x86/chromeos_laptop.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/drivers/platform/x86/chromeos_laptop.c b/drivers/platform/x86/chromeos_laptop.c
index 6440d22..9293c66 100644
--- a/drivers/platform/x86/chromeos_laptop.c
+++ b/drivers/platform/x86/chromeos_laptop.c
@@ -176,6 +176,13 @@ static struct dmi_system_id __initdata chromeos_laptop_dmi_table[] = {
},
.callback = setup_isl29018_als,
},
+ {
+ .ident = "Acer C7 Chromebook - Touchpad",
+ .matches = {
+ DMI_MATCH(DMI_PRODUCT_NAME, "Parrot"),
+ },
+ .callback = setup_cyapa_smbus_tp,
+ },
{ }
};
MODULE_DEVICE_TABLE(dmi, chromeos_laptop_dmi_table);
--
1.8.1
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 3/4] Platform: x86: chromeos_laptop - Add Taos tsl2563 device
2013-02-01 22:34 [PATCH 0/4] Platform: x86: chromeos_laptop - Add more x86 Chromebooks Benson Leung
2013-02-01 22:34 ` [PATCH 1/4] Platform: x86: chromeos_laptop - Rename setup_lumpy_tp to setup_cyapa_smbus_tp Benson Leung
2013-02-01 22:34 ` [PATCH 2/4] Platform: x86: chromeos_laptop - Add Acer C7 trackpad Benson Leung
@ 2013-02-01 22:34 ` Benson Leung
2013-02-01 22:34 ` [PATCH 4/4] Platform: x86: chromeos_laptop - Add Taos tsl2583 device Benson Leung
2013-02-11 0:20 ` [PATCH 0/1] Platform: x86: chromeos_laptop - Add HP Pavilion 14 Benson Leung
4 siblings, 0 replies; 7+ messages in thread
From: Benson Leung @ 2013-02-01 22:34 UTC (permalink / raw)
To: matthew.garrett, platform-driver-x86, linux-kernel; +Cc: bleung, olofj, olof
Two legacy Chromebooks, the Cr-48, and the Acer AC700,
are equipped with a Taos tsl2563 light sensor.
This will instantiate the sensor on those laptops.
Signed-off-by: Benson Leung <bleung@chromium.org>
---
drivers/platform/x86/chromeos_laptop.c | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/drivers/platform/x86/chromeos_laptop.c b/drivers/platform/x86/chromeos_laptop.c
index 9293c66..188b7da 100644
--- a/drivers/platform/x86/chromeos_laptop.c
+++ b/drivers/platform/x86/chromeos_laptop.c
@@ -27,6 +27,7 @@
#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;
@@ -49,6 +50,10 @@ static struct i2c_board_info __initdata isl_als_device = {
I2C_BOARD_INFO("isl29018", ISL_ALS_I2C_ADDR),
};
+static struct i2c_board_info __initdata tsl2563_als_device = {
+ I2C_BOARD_INFO("tsl2563", TAOS_ALS_I2C_ADDR),
+};
+
static struct i2c_client __init *__add_probed_i2c_device(
const char *name,
int bus,
@@ -159,6 +164,13 @@ static int __init setup_isl29018_als(const struct dmi_system_id *id)
return 0;
}
+static int __init setup_tsl2563_als(const struct dmi_system_id *id)
+{
+ /* add tsl2563 light sensor on smbus */
+ als = add_smbus_device(NULL, &tsl2563_als_device);
+ return 0;
+}
+
static struct dmi_system_id __initdata chromeos_laptop_dmi_table[] = {
{
.ident = "Samsung Series 5 550 - Touchpad",
@@ -183,6 +195,20 @@ static struct dmi_system_id __initdata chromeos_laptop_dmi_table[] = {
},
.callback = setup_cyapa_smbus_tp,
},
+ {
+ .ident = "Cr-48 - Light Sensor",
+ .matches = {
+ DMI_MATCH(DMI_PRODUCT_NAME, "Mario"),
+ },
+ .callback = setup_tsl2563_als,
+ },
+ {
+ .ident = "Acer AC700 - Light Sensor",
+ .matches = {
+ DMI_MATCH(DMI_PRODUCT_NAME, "ZGB"),
+ },
+ .callback = setup_tsl2563_als,
+ },
{ }
};
MODULE_DEVICE_TABLE(dmi, chromeos_laptop_dmi_table);
--
1.8.1
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 4/4] Platform: x86: chromeos_laptop - Add Taos tsl2583 device
2013-02-01 22:34 [PATCH 0/4] Platform: x86: chromeos_laptop - Add more x86 Chromebooks Benson Leung
` (2 preceding siblings ...)
2013-02-01 22:34 ` [PATCH 3/4] Platform: x86: chromeos_laptop - Add Taos tsl2563 device Benson Leung
@ 2013-02-01 22:34 ` Benson Leung
2013-02-11 0:20 ` [PATCH 0/1] Platform: x86: chromeos_laptop - Add HP Pavilion 14 Benson Leung
4 siblings, 0 replies; 7+ messages in thread
From: Benson Leung @ 2013-02-01 22:34 UTC (permalink / raw)
To: matthew.garrett, platform-driver-x86, linux-kernel; +Cc: bleung, olofj, olof
The Samsung Series 5 Chromebook is equipped with a Taos tsl2583
light sensor. Instatiate it here.
Signed-off-by: Benson Leung <bleung@chromium.org>
---
drivers/platform/x86/chromeos_laptop.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/drivers/platform/x86/chromeos_laptop.c b/drivers/platform/x86/chromeos_laptop.c
index 188b7da..95bf94f 100644
--- a/drivers/platform/x86/chromeos_laptop.c
+++ b/drivers/platform/x86/chromeos_laptop.c
@@ -50,6 +50,10 @@ static struct i2c_board_info __initdata isl_als_device = {
I2C_BOARD_INFO("isl29018", ISL_ALS_I2C_ADDR),
};
+static struct i2c_board_info __initdata tsl2583_als_device = {
+ I2C_BOARD_INFO("tsl2583", TAOS_ALS_I2C_ADDR),
+};
+
static struct i2c_board_info __initdata tsl2563_als_device = {
I2C_BOARD_INFO("tsl2563", TAOS_ALS_I2C_ADDR),
};
@@ -164,6 +168,13 @@ static int __init setup_isl29018_als(const struct dmi_system_id *id)
return 0;
}
+static int __init setup_tsl2583_als(const struct dmi_system_id *id)
+{
+ /* add tsl2583 light sensor on smbus */
+ als = add_smbus_device(NULL, &tsl2583_als_device);
+ return 0;
+}
+
static int __init setup_tsl2563_als(const struct dmi_system_id *id)
{
/* add tsl2563 light sensor on smbus */
@@ -196,6 +207,13 @@ static struct dmi_system_id __initdata chromeos_laptop_dmi_table[] = {
.callback = setup_cyapa_smbus_tp,
},
{
+ .ident = "Samsung Series 5 - Light Sensor",
+ .matches = {
+ DMI_MATCH(DMI_PRODUCT_NAME, "Alex"),
+ },
+ .callback = setup_tsl2583_als,
+ },
+ {
.ident = "Cr-48 - Light Sensor",
.matches = {
DMI_MATCH(DMI_PRODUCT_NAME, "Mario"),
--
1.8.1
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 0/1] Platform: x86: chromeos_laptop - Add HP Pavilion 14
2013-02-01 22:34 [PATCH 0/4] Platform: x86: chromeos_laptop - Add more x86 Chromebooks Benson Leung
` (3 preceding siblings ...)
2013-02-01 22:34 ` [PATCH 4/4] Platform: x86: chromeos_laptop - Add Taos tsl2583 device Benson Leung
@ 2013-02-11 0:20 ` Benson Leung
2013-02-11 0:20 ` [PATCH 1/1] " Benson Leung
4 siblings, 1 reply; 7+ messages in thread
From: Benson Leung @ 2013-02-11 0:20 UTC (permalink / raw)
To: matthew.garrett, platform-driver-x86, linux-kernel; +Cc: bleung, olofj, olof
This patch will add an entry for one more Chromebook that was released
last week: HP's Pavilion 14 Chromebook.
This will instatiate that system's Cypress APA trackpad, very similar
to the one in the Samsung 550 and Acer C7.
This should be merged after the previous patch series of 4:
Platform: x86: chromeos_laptop - Add more x86 Chromebooks
Thanks,
Benson
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 1/1] Platform: x86: chromeos_laptop - Add HP Pavilion 14
2013-02-11 0:20 ` [PATCH 0/1] Platform: x86: chromeos_laptop - Add HP Pavilion 14 Benson Leung
@ 2013-02-11 0:20 ` Benson Leung
0 siblings, 0 replies; 7+ messages in thread
From: Benson Leung @ 2013-02-11 0:20 UTC (permalink / raw)
To: matthew.garrett, platform-driver-x86, linux-kernel; +Cc: bleung, olofj, olof
Add support for the HP Pavilion 14 Chromebook's trackpad, which is a reuse
of the Samsung Series 5 550 trackpad.
Signed-off-by: Benson Leung <bleung@chromium.org>
---
drivers/platform/x86/chromeos_laptop.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/drivers/platform/x86/chromeos_laptop.c b/drivers/platform/x86/chromeos_laptop.c
index 95bf94f..bc6599c 100644
--- a/drivers/platform/x86/chromeos_laptop.c
+++ b/drivers/platform/x86/chromeos_laptop.c
@@ -207,6 +207,13 @@ static struct dmi_system_id __initdata chromeos_laptop_dmi_table[] = {
.callback = setup_cyapa_smbus_tp,
},
{
+ .ident = "HP Pavilion 14 Chromebook - Touchpad",
+ .matches = {
+ DMI_MATCH(DMI_PRODUCT_NAME, "Butterfly"),
+ },
+ .callback = setup_cyapa_smbus_tp,
+ },
+ {
.ident = "Samsung Series 5 - Light Sensor",
.matches = {
DMI_MATCH(DMI_PRODUCT_NAME, "Alex"),
--
1.8.1
^ permalink raw reply [flat|nested] 7+ messages in thread