aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek W <marekw1977@yahoo.com.au>2006-08-15 01:37:20 -0400
committerLen Brown <len.brown@intel.com>2006-10-14 00:27:06 -0400
commit288f3ad406460f03642a41bb945826891a7b866f (patch)
tree1153f127c2e4339d864b9a78a81438855a325fae
parentb4bd8c66435a8cdf8c90334fb3b517a23ff2ab95 (diff)
ACPI: asus_acpi: W3000 support
Add support for W3000 (W3V) and indirectly fixes an issue with kmilo under KDE (it was triggering excessive LCD read error messages by querying asus_acpi module) allowing people (I am probably the only one who tested this) with W3000 to run kmilo. Cc: Karol Kozimor <sziwan@hell.org.pl> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r--drivers/acpi/asus_acpi.c17
1 files changed, 16 insertions, 1 deletions
diff --git a/drivers/acpi/asus_acpi.c b/drivers/acpi/asus_acpi.c
index e9ee4c52a5f6..ebc033f87e79 100644
--- a/drivers/acpi/asus_acpi.c
+++ b/drivers/acpi/asus_acpi.c
@@ -138,6 +138,7 @@ struct asus_hotk {
138 S2x, //S200 (J1 reported), Victor MP-XP7210 138 S2x, //S200 (J1 reported), Victor MP-XP7210
139 W1N, //W1000N 139 W1N, //W1000N
140 W5A, //W5A 140 W5A, //W5A
141 W3V, //W3030V
141 xxN, //M2400N, M3700N, M5200N, M6800N, S1300N, S5200N 142 xxN, //M2400N, M3700N, M5200N, M6800N, S1300N, S5200N
142 //(Centrino) 143 //(Centrino)
143 END_MODEL 144 END_MODEL
@@ -376,6 +377,17 @@ static struct model_data model_conf[END_MODEL] = {
376 .display_get = "\\ADVG"}, 377 .display_get = "\\ADVG"},
377 378
378 { 379 {
380 .name = "W3V",
381 .mt_mled = "MLED",
382 .mt_wled = "WLED",
383 .mt_lcd_switch = xxN_PREFIX "_Q10",
384 .lcd_status = "\\BKLT",
385 .brightness_set = "SPLV",
386 .brightness_get = "GPLV",
387 .display_set = "SDSP",
388 .display_get = "\\INFB"},
389
390 {
379 .name = "xxN", 391 .name = "xxN",
380 .mt_mled = "MLED", 392 .mt_mled = "MLED",
381/* WLED present, but not controlled by ACPI */ 393/* WLED present, but not controlled by ACPI */
@@ -1097,6 +1109,8 @@ static int asus_model_match(char *model)
1097 return A4G; 1109 return A4G;
1098 else if (strncmp(model, "W1N", 3) == 0) 1110 else if (strncmp(model, "W1N", 3) == 0)
1099 return W1N; 1111 return W1N;
1112 else if (strncmp(model, "W3V", 3) == 0)
1113 return W3V;
1100 else if (strncmp(model, "W5A", 3) == 0) 1114 else if (strncmp(model, "W5A", 3) == 0)
1101 return W5A; 1115 return W5A;
1102 else 1116 else
@@ -1200,9 +1214,10 @@ static int asus_hotk_get_info(void)
1200 hotk->methods->mt_wled = NULL; 1214 hotk->methods->mt_wled = NULL;
1201 /* L5D's WLED is not controlled by ACPI */ 1215 /* L5D's WLED is not controlled by ACPI */
1202 else if (strncmp(string, "M2N", 3) == 0 || 1216 else if (strncmp(string, "M2N", 3) == 0 ||
1217 strncmp(string, "W3V", 3) == 0 ||
1203 strncmp(string, "S1N", 3) == 0) 1218 strncmp(string, "S1N", 3) == 0)
1204 hotk->methods->mt_wled = "WLED"; 1219 hotk->methods->mt_wled = "WLED";
1205 /* M2N and S1N have a usable WLED */ 1220 /* M2N, S1N and W3V have a usable WLED */
1206 else if (asus_info) { 1221 else if (asus_info) {
1207 if (strncmp(asus_info->oem_table_id, "L1", 2) == 0) 1222 if (strncmp(asus_info->oem_table_id, "L1", 2) == 0)
1208 hotk->methods->mled_status = NULL; 1223 hotk->methods->mled_status = NULL;