diff options
author | Corentin Chary <corentincj@iksaif.net> | 2009-06-16 15:28:52 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-06-24 01:31:10 -0400 |
commit | b7b700d4a473d56103e87e341ad555e8a7cce06d (patch) | |
tree | 5ed41024e62a83213f9e934e0a3e6d6339c42213 | |
parent | 6122af3743a48dddae19810626dd7c9c8e6c1df8 (diff) |
eeepc-laptop: sync eeepc-laptop with asus_acpi
In the default Eee PC distribution, there is a modified
asus_acpi driver. eeepc-laptop is a cleaned version of this
driver. Sync ASL enum and getter/setters with asus_acpi.
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r-- | drivers/platform/x86/eeepc-laptop.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c index 884d76b9e8ba..73f3cb0fd76c 100644 --- a/drivers/platform/x86/eeepc-laptop.c +++ b/drivers/platform/x86/eeepc-laptop.c | |||
@@ -62,7 +62,10 @@ enum { | |||
62 | DISABLE_ASL_GPS = 0x0020, | 62 | DISABLE_ASL_GPS = 0x0020, |
63 | DISABLE_ASL_DISPLAYSWITCH = 0x0040, | 63 | DISABLE_ASL_DISPLAYSWITCH = 0x0040, |
64 | DISABLE_ASL_MODEM = 0x0080, | 64 | DISABLE_ASL_MODEM = 0x0080, |
65 | DISABLE_ASL_CARDREADER = 0x0100 | 65 | DISABLE_ASL_CARDREADER = 0x0100, |
66 | DISABLE_ASL_3G = 0x0200, | ||
67 | DISABLE_ASL_WIMAX = 0x0400, | ||
68 | DISABLE_ASL_HWCF = 0x0800 | ||
66 | }; | 69 | }; |
67 | 70 | ||
68 | enum { | 71 | enum { |
@@ -87,7 +90,13 @@ enum { | |||
87 | CM_ASL_USBPORT3, | 90 | CM_ASL_USBPORT3, |
88 | CM_ASL_MODEM, | 91 | CM_ASL_MODEM, |
89 | CM_ASL_CARDREADER, | 92 | CM_ASL_CARDREADER, |
90 | CM_ASL_LID | 93 | CM_ASL_3G, |
94 | CM_ASL_WIMAX, | ||
95 | CM_ASL_HWCF, | ||
96 | CM_ASL_LID, | ||
97 | CM_ASL_TYPE, | ||
98 | CM_ASL_PANELPOWER, /*P901*/ | ||
99 | CM_ASL_TPD | ||
91 | }; | 100 | }; |
92 | 101 | ||
93 | static const char *cm_getv[] = { | 102 | static const char *cm_getv[] = { |
@@ -96,7 +105,8 @@ static const char *cm_getv[] = { | |||
96 | NULL, "PBLG", NULL, NULL, | 105 | NULL, "PBLG", NULL, NULL, |
97 | "CFVG", NULL, NULL, NULL, | 106 | "CFVG", NULL, NULL, NULL, |
98 | "USBG", NULL, NULL, "MODG", | 107 | "USBG", NULL, NULL, "MODG", |
99 | "CRDG", "LIDG" | 108 | "CRDG", "M3GG", "WIMG", "HWCF", |
109 | "LIDG", "TYPE", "PBPG", "TPDG" | ||
100 | }; | 110 | }; |
101 | 111 | ||
102 | static const char *cm_setv[] = { | 112 | static const char *cm_setv[] = { |
@@ -105,7 +115,8 @@ static const char *cm_setv[] = { | |||
105 | "SDSP", "PBLS", "HDPS", NULL, | 115 | "SDSP", "PBLS", "HDPS", NULL, |
106 | "CFVS", NULL, NULL, NULL, | 116 | "CFVS", NULL, NULL, NULL, |
107 | "USBG", NULL, NULL, "MODS", | 117 | "USBG", NULL, NULL, "MODS", |
108 | "CRDS", NULL | 118 | "CRDS", "M3GS", "WIMS", NULL, |
119 | NULL, NULL, "PBPS", "TPDS" | ||
109 | }; | 120 | }; |
110 | 121 | ||
111 | #define EEEPC_EC "\\_SB.PCI0.SBRG.EC0." | 122 | #define EEEPC_EC "\\_SB.PCI0.SBRG.EC0." |