diff options
author | Eric Piel <eric.piel@tremplin-utc.net> | 2009-06-16 18:34:16 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-16 22:47:57 -0400 |
commit | 0093716e6dd18dad554bef81cc788a4c50d32a09 (patch) | |
tree | 5e0005104794b8e40cb287eec722e6c70ab87e1c /drivers/hwmon | |
parent | dc6ea97bac6b8228c7a69740df35eed2be3407be (diff) |
lis3: add three new laptop models
Separate the 6710 and 6715, and set the right axis information for the
6715.
Reported-by: Isaac702 <isaac702@gmail.com>
Add the 6930.
Reported-by: Christian Weidle <slateroni@gmail.com>
Add the 2710.
Reported-by: Pavel Herrmann <morpheus.ibis@gmail.com>
Signed-off-by: Eric Piel <eric.piel@tremplin-utc.net>
Signed-off-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/hwmon')
-rw-r--r-- | drivers/hwmon/hp_accel.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/hwmon/hp_accel.c b/drivers/hwmon/hp_accel.c index 92db68ea948a..6679854c85b0 100644 --- a/drivers/hwmon/hp_accel.c +++ b/drivers/hwmon/hp_accel.c | |||
@@ -158,6 +158,7 @@ static struct axis_conversion lis3lv02d_axis_normal = {1, 2, 3}; | |||
158 | static struct axis_conversion lis3lv02d_axis_y_inverted = {1, -2, 3}; | 158 | static struct axis_conversion lis3lv02d_axis_y_inverted = {1, -2, 3}; |
159 | static struct axis_conversion lis3lv02d_axis_x_inverted = {-1, 2, 3}; | 159 | static struct axis_conversion lis3lv02d_axis_x_inverted = {-1, 2, 3}; |
160 | static struct axis_conversion lis3lv02d_axis_z_inverted = {1, 2, -3}; | 160 | static struct axis_conversion lis3lv02d_axis_z_inverted = {1, 2, -3}; |
161 | static struct axis_conversion lis3lv02d_axis_xy_swap = {2, 1, 3}; | ||
161 | static struct axis_conversion lis3lv02d_axis_xy_rotated_left = {-2, 1, 3}; | 162 | static struct axis_conversion lis3lv02d_axis_xy_rotated_left = {-2, 1, 3}; |
162 | static struct axis_conversion lis3lv02d_axis_xy_rotated_left_usd = {-2, 1, -3}; | 163 | static struct axis_conversion lis3lv02d_axis_xy_rotated_left_usd = {-2, 1, -3}; |
163 | static struct axis_conversion lis3lv02d_axis_xy_swap_inverted = {-2, -1, 3}; | 164 | static struct axis_conversion lis3lv02d_axis_xy_swap_inverted = {-2, -1, 3}; |
@@ -191,13 +192,16 @@ static struct dmi_system_id lis3lv02d_dmi_ids[] = { | |||
191 | AXIS_DMI_MATCH("NX9420", "HP Compaq nx9420", x_inverted), | 192 | AXIS_DMI_MATCH("NX9420", "HP Compaq nx9420", x_inverted), |
192 | AXIS_DMI_MATCH("NW9440", "HP Compaq nw9440", x_inverted), | 193 | AXIS_DMI_MATCH("NW9440", "HP Compaq nw9440", x_inverted), |
193 | AXIS_DMI_MATCH("NC2510", "HP Compaq 2510", y_inverted), | 194 | AXIS_DMI_MATCH("NC2510", "HP Compaq 2510", y_inverted), |
195 | AXIS_DMI_MATCH("NC2710", "HP Compaq 2710", xy_swap), | ||
194 | AXIS_DMI_MATCH("NC8510", "HP Compaq 8510", xy_swap_inverted), | 196 | AXIS_DMI_MATCH("NC8510", "HP Compaq 8510", xy_swap_inverted), |
195 | AXIS_DMI_MATCH("HP2133", "HP 2133", xy_rotated_left), | 197 | AXIS_DMI_MATCH("HP2133", "HP 2133", xy_rotated_left), |
196 | AXIS_DMI_MATCH("HP2140", "HP 2140", xy_swap_inverted), | 198 | AXIS_DMI_MATCH("HP2140", "HP 2140", xy_swap_inverted), |
197 | AXIS_DMI_MATCH("NC653x", "HP Compaq 653", xy_rotated_left_usd), | 199 | AXIS_DMI_MATCH("NC653x", "HP Compaq 653", xy_rotated_left_usd), |
198 | AXIS_DMI_MATCH("NC673x", "HP Compaq 673", xy_rotated_left_usd), | 200 | AXIS_DMI_MATCH("NC673x", "HP Compaq 673", xy_rotated_left_usd), |
199 | AXIS_DMI_MATCH("NC651xx", "HP Compaq 651", xy_rotated_right), | 201 | AXIS_DMI_MATCH("NC651xx", "HP Compaq 651", xy_rotated_right), |
200 | AXIS_DMI_MATCH("NC671xx", "HP Compaq 671", xy_swap_yz_inverted), | 202 | AXIS_DMI_MATCH("NC6710x", "HP Compaq 6710", xy_swap_yz_inverted), |
203 | AXIS_DMI_MATCH("NC6715x", "HP Compaq 6715", y_inverted), | ||
204 | AXIS_DMI_MATCH("NC693xx", "HP EliteBook 693", xy_rotated_right), | ||
201 | /* Intel-based HP Pavilion dv5 */ | 205 | /* Intel-based HP Pavilion dv5 */ |
202 | AXIS_DMI_MATCH2("HPDV5_I", | 206 | AXIS_DMI_MATCH2("HPDV5_I", |
203 | PRODUCT_NAME, "HP Pavilion dv5", | 207 | PRODUCT_NAME, "HP Pavilion dv5", |
@@ -213,7 +217,6 @@ static struct dmi_system_id lis3lv02d_dmi_ids[] = { | |||
213 | { NULL, } | 217 | { NULL, } |
214 | /* Laptop models without axis info (yet): | 218 | /* Laptop models without axis info (yet): |
215 | * "NC6910" "HP Compaq 6910" | 219 | * "NC6910" "HP Compaq 6910" |
216 | * HP Compaq 8710x Notebook PC / Mobile Workstation | ||
217 | * "NC2400" "HP Compaq nc2400" | 220 | * "NC2400" "HP Compaq nc2400" |
218 | * "NX74x0" "HP Compaq nx74" | 221 | * "NX74x0" "HP Compaq nx74" |
219 | * "NX6325" "HP Compaq nx6325" | 222 | * "NX6325" "HP Compaq nx6325" |