From 24f1c7979fa607087c273b8f336a9233efe9d8e6 Mon Sep 17 00:00:00 2001
From: Benson Leung <bleung@chromium.org>
Date: Fri, 1 Feb 2013 14:34:45 -0800
Subject: [PATCH] --- yaml --- r: 360559 b: refs/heads/master c:
 aabf3f442b0f42b3a37ed7beb8d5f3f249b812ca h: refs/heads/master i:   360557:
 88a54731ee9a283a7ffa8b53cd0c14dc227e0629   360555:
 48ff9a509a9d5eeaa203ab191544244a8c8e1627   360551:
 5df62fccbed8969dff051e16e8fb635dd339608e   360543:
 0a102a1d5f95365394b65cbbb9316d1ea2ded01e v: v3

---
 [refs]                                       |  2 +-
 trunk/drivers/platform/x86/chromeos_laptop.c | 26 ++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 13bdf3986ea0..e6b55de6ded4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 261f171f571a82c1f990d484c374aa3f7236fe5e
+refs/heads/master: aabf3f442b0f42b3a37ed7beb8d5f3f249b812ca
diff --git a/trunk/drivers/platform/x86/chromeos_laptop.c b/trunk/drivers/platform/x86/chromeos_laptop.c
index 9293c66d52c1..188b7dac7780 100644
--- a/trunk/drivers/platform/x86/chromeos_laptop.c
+++ b/trunk/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);