Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 360560
b: refs/heads/master
c: 8016bcb
h: refs/heads/master
v: v3
  • Loading branch information
Benson Leung authored and Matthew Garrett committed Feb 27, 2013
1 parent 24f1c79 commit b1dd881
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: aabf3f442b0f42b3a37ed7beb8d5f3f249b812ca
refs/heads/master: 8016bcbc380f952bfccb82fde3bb8b4b9cbd6400
18 changes: 18 additions & 0 deletions trunk/drivers/platform/x86/chromeos_laptop.c
Original file line number Diff line number Diff line change
Expand Up @@ -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),
};
Expand Down Expand Up @@ -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 */
Expand Down Expand Up @@ -195,6 +206,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 = {
Expand Down

0 comments on commit b1dd881

Please sign in to comment.