diff options
-rw-r--r-- | drivers/Kconfig | 2 | ||||
-rw-r--r-- | drivers/Makefile | 1 | ||||
-rw-r--r-- | drivers/misc/Kconfig | 280 | ||||
-rw-r--r-- | drivers/misc/Makefile | 12 | ||||
-rw-r--r-- | drivers/platform/Kconfig | 5 | ||||
-rw-r--r-- | drivers/platform/Makefile | 5 | ||||
-rw-r--r-- | drivers/platform/x86/Kconfig | 290 | ||||
-rw-r--r-- | drivers/platform/x86/Makefile | 16 | ||||
-rw-r--r-- | drivers/platform/x86/acer-wmi.c (renamed from drivers/misc/acer-wmi.c) | 0 | ||||
-rw-r--r-- | drivers/platform/x86/asus-laptop.c (renamed from drivers/misc/asus-laptop.c) | 0 | ||||
-rw-r--r-- | drivers/platform/x86/compal-laptop.c (renamed from drivers/misc/compal-laptop.c) | 0 | ||||
-rw-r--r-- | drivers/platform/x86/eeepc-laptop.c (renamed from drivers/misc/eeepc-laptop.c) | 0 | ||||
-rw-r--r-- | drivers/platform/x86/fujitsu-laptop.c (renamed from drivers/misc/fujitsu-laptop.c) | 0 | ||||
-rw-r--r-- | drivers/platform/x86/hp-wmi.c (renamed from drivers/misc/hp-wmi.c) | 0 | ||||
-rw-r--r-- | drivers/platform/x86/intel_menlow.c (renamed from drivers/misc/intel_menlow.c) | 0 | ||||
-rw-r--r-- | drivers/platform/x86/msi-laptop.c (renamed from drivers/misc/msi-laptop.c) | 0 | ||||
-rw-r--r-- | drivers/platform/x86/panasonic-laptop.c (renamed from drivers/misc/panasonic-laptop.c) | 0 | ||||
-rw-r--r-- | drivers/platform/x86/sony-laptop.c (renamed from drivers/misc/sony-laptop.c) | 0 | ||||
-rw-r--r-- | drivers/platform/x86/tc1100-wmi.c (renamed from drivers/misc/tc1100-wmi.c) | 0 | ||||
-rw-r--r-- | drivers/platform/x86/thinkpad_acpi.c (renamed from drivers/misc/thinkpad_acpi.c) | 0 |
20 files changed, 319 insertions, 292 deletions
diff --git a/drivers/Kconfig b/drivers/Kconfig index 2f557f570ade..00cf9553f740 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig | |||
@@ -107,4 +107,6 @@ source "drivers/uio/Kconfig" | |||
107 | source "drivers/xen/Kconfig" | 107 | source "drivers/xen/Kconfig" |
108 | 108 | ||
109 | source "drivers/staging/Kconfig" | 109 | source "drivers/staging/Kconfig" |
110 | |||
111 | source "drivers/platform/Kconfig" | ||
110 | endmenu | 112 | endmenu |
diff --git a/drivers/Makefile b/drivers/Makefile index fceb71a741c3..46d4828042c3 100644 --- a/drivers/Makefile +++ b/drivers/Makefile | |||
@@ -102,3 +102,4 @@ obj-$(CONFIG_SSB) += ssb/ | |||
102 | obj-$(CONFIG_VIRTIO) += virtio/ | 102 | obj-$(CONFIG_VIRTIO) += virtio/ |
103 | obj-$(CONFIG_REGULATOR) += regulator/ | 103 | obj-$(CONFIG_REGULATOR) += regulator/ |
104 | obj-$(CONFIG_STAGING) += staging/ | 104 | obj-$(CONFIG_STAGING) += staging/ |
105 | obj-y += platform/ | ||
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index dcf61690bd28..8574879fa63b 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig | |||
@@ -136,97 +136,6 @@ config TIFM_7XX1 | |||
136 | To compile this driver as a module, choose M here: the module will | 136 | To compile this driver as a module, choose M here: the module will |
137 | be called tifm_7xx1. | 137 | be called tifm_7xx1. |
138 | 138 | ||
139 | config ACER_WMI | ||
140 | tristate "Acer WMI Laptop Extras (EXPERIMENTAL)" | ||
141 | depends on X86 | ||
142 | depends on EXPERIMENTAL | ||
143 | depends on ACPI | ||
144 | depends on LEDS_CLASS | ||
145 | depends on NEW_LEDS | ||
146 | depends on BACKLIGHT_CLASS_DEVICE | ||
147 | depends on SERIO_I8042 | ||
148 | depends on RFKILL | ||
149 | select ACPI_WMI | ||
150 | ---help--- | ||
151 | This is a driver for newer Acer (and Wistron) laptops. It adds | ||
152 | wireless radio and bluetooth control, and on some laptops, | ||
153 | exposes the mail LED and LCD backlight. | ||
154 | |||
155 | For more information about this driver see | ||
156 | <file:Documentation/laptops/acer-wmi.txt> | ||
157 | |||
158 | If you have an ACPI-WMI compatible Acer/ Wistron laptop, say Y or M | ||
159 | here. | ||
160 | |||
161 | config ASUS_LAPTOP | ||
162 | tristate "Asus Laptop Extras (EXPERIMENTAL)" | ||
163 | depends on X86 | ||
164 | depends on ACPI | ||
165 | depends on EXPERIMENTAL && !ACPI_ASUS | ||
166 | depends on LEDS_CLASS | ||
167 | depends on NEW_LEDS | ||
168 | depends on BACKLIGHT_CLASS_DEVICE | ||
169 | ---help--- | ||
170 | This is the new Linux driver for Asus laptops. It may also support some | ||
171 | MEDION, JVC or VICTOR laptops. It makes all the extra buttons generate | ||
172 | standard ACPI events that go through /proc/acpi/events. It also adds | ||
173 | support for video output switching, LCD backlight control, Bluetooth and | ||
174 | Wlan control, and most importantly, allows you to blink those fancy LEDs. | ||
175 | |||
176 | For more information and a userspace daemon for handling the extra | ||
177 | buttons see <http://acpi4asus.sf.net/>. | ||
178 | |||
179 | If you have an ACPI-compatible ASUS laptop, say Y or M here. | ||
180 | |||
181 | config FUJITSU_LAPTOP | ||
182 | tristate "Fujitsu Laptop Extras" | ||
183 | depends on X86 | ||
184 | depends on ACPI | ||
185 | depends on INPUT | ||
186 | depends on BACKLIGHT_CLASS_DEVICE | ||
187 | ---help--- | ||
188 | This is a driver for laptops built by Fujitsu: | ||
189 | |||
190 | * P2xxx/P5xxx/S6xxx/S7xxx series Lifebooks | ||
191 | * Possibly other Fujitsu laptop models | ||
192 | * Tested with S6410 and S7020 | ||
193 | |||
194 | It adds support for LCD brightness control and some hotkeys. | ||
195 | |||
196 | If you have a Fujitsu laptop, say Y or M here. | ||
197 | |||
198 | config FUJITSU_LAPTOP_DEBUG | ||
199 | bool "Verbose debug mode for Fujitsu Laptop Extras" | ||
200 | depends on FUJITSU_LAPTOP | ||
201 | default n | ||
202 | ---help--- | ||
203 | Enables extra debug output from the fujitsu extras driver, at the | ||
204 | expense of a slight increase in driver size. | ||
205 | |||
206 | If you are not sure, say N here. | ||
207 | |||
208 | config TC1100_WMI | ||
209 | tristate "HP Compaq TC1100 Tablet WMI Extras (EXPERIMENTAL)" | ||
210 | depends on X86 && !X86_64 | ||
211 | depends on EXPERIMENTAL | ||
212 | depends on ACPI | ||
213 | select ACPI_WMI | ||
214 | ---help--- | ||
215 | This is a driver for the WMI extensions (wireless and bluetooth power | ||
216 | control) of the HP Compaq TC1100 tablet. | ||
217 | |||
218 | config HP_WMI | ||
219 | tristate "HP WMI extras" | ||
220 | depends on ACPI_WMI | ||
221 | depends on INPUT | ||
222 | depends on RFKILL | ||
223 | help | ||
224 | Say Y here if you want to support WMI-based hotkeys on HP laptops and | ||
225 | to read data from WMI such as docking or ambient light sensor state. | ||
226 | |||
227 | To compile this driver as a module, choose M here: the module will | ||
228 | be called hp-wmi. | ||
229 | |||
230 | config ICS932S401 | 139 | config ICS932S401 |
231 | tristate "Integrated Circuits ICS932S401" | 140 | tristate "Integrated Circuits ICS932S401" |
232 | depends on I2C && EXPERIMENTAL | 141 | depends on I2C && EXPERIMENTAL |
@@ -237,170 +146,6 @@ config ICS932S401 | |||
237 | This driver can also be built as a module. If so, the module | 146 | This driver can also be built as a module. If so, the module |
238 | will be called ics932s401. | 147 | will be called ics932s401. |
239 | 148 | ||
240 | config MSI_LAPTOP | ||
241 | tristate "MSI Laptop Extras" | ||
242 | depends on X86 | ||
243 | depends on ACPI | ||
244 | depends on BACKLIGHT_CLASS_DEVICE | ||
245 | ---help--- | ||
246 | This is a driver for laptops built by MSI (MICRO-STAR | ||
247 | INTERNATIONAL): | ||
248 | |||
249 | MSI MegaBook S270 (MS-1013) | ||
250 | Cytron/TCM/Medion/Tchibo MD96100/SAM2000 | ||
251 | |||
252 | It adds support for Bluetooth, WLAN and LCD brightness control. | ||
253 | |||
254 | More information about this driver is available at | ||
255 | <http://0pointer.de/lennart/tchibo.html>. | ||
256 | |||
257 | If you have an MSI S270 laptop, say Y or M here. | ||
258 | |||
259 | config PANASONIC_LAPTOP | ||
260 | tristate "Panasonic Laptop Extras" | ||
261 | depends on X86 && INPUT && ACPI | ||
262 | depends on BACKLIGHT_CLASS_DEVICE | ||
263 | ---help--- | ||
264 | This driver adds support for access to backlight control and hotkeys | ||
265 | on Panasonic Let's Note laptops. | ||
266 | |||
267 | If you have a Panasonic Let's note laptop (such as the R1(N variant), | ||
268 | R2, R3, R5, T2, W2 and Y2 series), say Y. | ||
269 | |||
270 | config COMPAL_LAPTOP | ||
271 | tristate "Compal Laptop Extras" | ||
272 | depends on X86 | ||
273 | depends on ACPI | ||
274 | depends on BACKLIGHT_CLASS_DEVICE | ||
275 | ---help--- | ||
276 | This is a driver for laptops built by Compal: | ||
277 | |||
278 | Compal FL90/IFL90 | ||
279 | Compal FL91/IFL91 | ||
280 | Compal FL92/JFL92 | ||
281 | Compal FT00/IFT00 | ||
282 | |||
283 | It adds support for Bluetooth, WLAN and LCD brightness control. | ||
284 | |||
285 | If you have an Compal FL9x/IFL9x/FT00 laptop, say Y or M here. | ||
286 | |||
287 | config SONY_LAPTOP | ||
288 | tristate "Sony Laptop Extras" | ||
289 | depends on X86 && ACPI | ||
290 | select BACKLIGHT_CLASS_DEVICE | ||
291 | depends on INPUT | ||
292 | ---help--- | ||
293 | This mini-driver drives the SNC and SPIC devices present in the ACPI | ||
294 | BIOS of the Sony Vaio laptops. | ||
295 | |||
296 | It gives access to some extra laptop functionalities like Bluetooth, | ||
297 | screen brightness control, Fn keys and allows powering on/off some | ||
298 | devices. | ||
299 | |||
300 | Read <file:Documentation/laptops/sony-laptop.txt> for more information. | ||
301 | |||
302 | config SONYPI_COMPAT | ||
303 | bool "Sonypi compatibility" | ||
304 | depends on SONY_LAPTOP | ||
305 | ---help--- | ||
306 | Build the sonypi driver compatibility code into the sony-laptop driver. | ||
307 | |||
308 | config THINKPAD_ACPI | ||
309 | tristate "ThinkPad ACPI Laptop Extras" | ||
310 | depends on X86 && ACPI | ||
311 | select BACKLIGHT_LCD_SUPPORT | ||
312 | select BACKLIGHT_CLASS_DEVICE | ||
313 | select HWMON | ||
314 | select NVRAM | ||
315 | select INPUT | ||
316 | select NEW_LEDS | ||
317 | select LEDS_CLASS | ||
318 | select NET | ||
319 | select RFKILL | ||
320 | ---help--- | ||
321 | This is a driver for the IBM and Lenovo ThinkPad laptops. It adds | ||
322 | support for Fn-Fx key combinations, Bluetooth control, video | ||
323 | output switching, ThinkLight control, UltraBay eject and more. | ||
324 | For more information about this driver see | ||
325 | <file:Documentation/laptops/thinkpad-acpi.txt> and | ||
326 | <http://ibm-acpi.sf.net/> . | ||
327 | |||
328 | This driver was formerly known as ibm-acpi. | ||
329 | |||
330 | If you have an IBM or Lenovo ThinkPad laptop, say Y or M here. | ||
331 | |||
332 | config THINKPAD_ACPI_DEBUG | ||
333 | bool "Verbose debug mode" | ||
334 | depends on THINKPAD_ACPI | ||
335 | default n | ||
336 | ---help--- | ||
337 | Enables extra debugging information, at the expense of a slightly | ||
338 | increase in driver size. | ||
339 | |||
340 | If you are not sure, say N here. | ||
341 | |||
342 | config THINKPAD_ACPI_DOCK | ||
343 | bool "Legacy Docking Station Support" | ||
344 | depends on THINKPAD_ACPI | ||
345 | depends on ACPI_DOCK=n | ||
346 | default n | ||
347 | ---help--- | ||
348 | Allows the thinkpad_acpi driver to handle docking station events. | ||
349 | This support was made obsolete by the generic ACPI docking station | ||
350 | support (CONFIG_ACPI_DOCK). It will allow locking and removing the | ||
351 | laptop from the docking station, but will not properly connect PCI | ||
352 | devices. | ||
353 | |||
354 | If you are not sure, say N here. | ||
355 | |||
356 | config THINKPAD_ACPI_BAY | ||
357 | bool "Legacy Removable Bay Support" | ||
358 | depends on THINKPAD_ACPI | ||
359 | default y | ||
360 | ---help--- | ||
361 | Allows the thinkpad_acpi driver to handle removable bays. It will | ||
362 | electrically disable the device in the bay, and also generate | ||
363 | notifications when the bay lever is ejected or inserted. | ||
364 | |||
365 | If you are not sure, say Y here. | ||
366 | |||
367 | config THINKPAD_ACPI_VIDEO | ||
368 | bool "Video output control support" | ||
369 | depends on THINKPAD_ACPI | ||
370 | default y | ||
371 | ---help--- | ||
372 | Allows the thinkpad_acpi driver to provide an interface to control | ||
373 | the various video output ports. | ||
374 | |||
375 | This feature often won't work well, depending on ThinkPad model, | ||
376 | display state, video output devices in use, whether there is a X | ||
377 | server running, phase of the moon, and the current mood of | ||
378 | Schroedinger's cat. If you can use X.org's RandR to control | ||
379 | your ThinkPad's video output ports instead of this feature, | ||
380 | don't think twice: do it and say N here to save some memory. | ||
381 | |||
382 | If you are not sure, say Y here. | ||
383 | |||
384 | config THINKPAD_ACPI_HOTKEY_POLL | ||
385 | bool "Support NVRAM polling for hot keys" | ||
386 | depends on THINKPAD_ACPI | ||
387 | default y | ||
388 | ---help--- | ||
389 | Some thinkpad models benefit from NVRAM polling to detect a few of | ||
390 | the hot key press events. If you know your ThinkPad model does not | ||
391 | need to do NVRAM polling to support any of the hot keys you use, | ||
392 | unselecting this option will save about 1kB of memory. | ||
393 | |||
394 | ThinkPads T40 and newer, R52 and newer, and X31 and newer are | ||
395 | unlikely to need NVRAM polling in their latest BIOS versions. | ||
396 | |||
397 | NVRAM polling can detect at most the following keys: ThinkPad/Access | ||
398 | IBM, Zoom, Switch Display (fn+F7), ThinkLight, Volume up/down/mute, | ||
399 | Brightness up/down, Display Expand (fn+F8), Hibernate (fn+F12). | ||
400 | |||
401 | If you are not sure, say Y here. The driver enables polling only if | ||
402 | it is strictly necessary to do so. | ||
403 | |||
404 | config ATMEL_SSC | 149 | config ATMEL_SSC |
405 | tristate "Device driver for Atmel SSC peripheral" | 150 | tristate "Device driver for Atmel SSC peripheral" |
406 | depends on AVR32 || ARCH_AT91 | 151 | depends on AVR32 || ARCH_AT91 |
@@ -413,31 +158,6 @@ config ATMEL_SSC | |||
413 | 158 | ||
414 | If unsure, say N. | 159 | If unsure, say N. |
415 | 160 | ||
416 | config INTEL_MENLOW | ||
417 | tristate "Thermal Management driver for Intel menlow platform" | ||
418 | depends on ACPI_THERMAL | ||
419 | select THERMAL | ||
420 | depends on X86 | ||
421 | ---help--- | ||
422 | ACPI thermal management enhancement driver on | ||
423 | Intel Menlow platform. | ||
424 | |||
425 | If unsure, say N. | ||
426 | |||
427 | config EEEPC_LAPTOP | ||
428 | tristate "Eee PC Hotkey Driver (EXPERIMENTAL)" | ||
429 | depends on X86 | ||
430 | depends on ACPI | ||
431 | depends on BACKLIGHT_CLASS_DEVICE | ||
432 | depends on HWMON | ||
433 | depends on EXPERIMENTAL | ||
434 | depends on RFKILL | ||
435 | ---help--- | ||
436 | This driver supports the Fn-Fx keys on Eee PC laptops. | ||
437 | It also adds the ability to switch camera/wlan on/off. | ||
438 | |||
439 | If you have an Eee PC laptop, say Y or M here. | ||
440 | |||
441 | config ENCLOSURE_SERVICES | 161 | config ENCLOSURE_SERVICES |
442 | tristate "Enclosure Services" | 162 | tristate "Enclosure Services" |
443 | default n | 163 | default n |
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index 027e1eae7c89..d5749a7bc777 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile | |||
@@ -4,28 +4,16 @@ | |||
4 | 4 | ||
5 | obj-$(CONFIG_IBM_ASM) += ibmasm/ | 5 | obj-$(CONFIG_IBM_ASM) += ibmasm/ |
6 | obj-$(CONFIG_HDPU_FEATURES) += hdpuftrs/ | 6 | obj-$(CONFIG_HDPU_FEATURES) += hdpuftrs/ |
7 | obj-$(CONFIG_ASUS_LAPTOP) += asus-laptop.o | ||
8 | obj-$(CONFIG_EEEPC_LAPTOP) += eeepc-laptop.o | ||
9 | obj-$(CONFIG_MSI_LAPTOP) += msi-laptop.o | ||
10 | obj-$(CONFIG_COMPAL_LAPTOP) += compal-laptop.o | ||
11 | obj-$(CONFIG_ACER_WMI) += acer-wmi.o | ||
12 | obj-$(CONFIG_ATMEL_PWM) += atmel_pwm.o | 7 | obj-$(CONFIG_ATMEL_PWM) += atmel_pwm.o |
13 | obj-$(CONFIG_ATMEL_SSC) += atmel-ssc.o | 8 | obj-$(CONFIG_ATMEL_SSC) += atmel-ssc.o |
14 | obj-$(CONFIG_ATMEL_TCLIB) += atmel_tclib.o | 9 | obj-$(CONFIG_ATMEL_TCLIB) += atmel_tclib.o |
15 | obj-$(CONFIG_HP_WMI) += hp-wmi.o | ||
16 | obj-$(CONFIG_ICS932S401) += ics932s401.o | 10 | obj-$(CONFIG_ICS932S401) += ics932s401.o |
17 | obj-$(CONFIG_TC1100_WMI) += tc1100-wmi.o | ||
18 | obj-$(CONFIG_LKDTM) += lkdtm.o | 11 | obj-$(CONFIG_LKDTM) += lkdtm.o |
19 | obj-$(CONFIG_TIFM_CORE) += tifm_core.o | 12 | obj-$(CONFIG_TIFM_CORE) += tifm_core.o |
20 | obj-$(CONFIG_TIFM_7XX1) += tifm_7xx1.o | 13 | obj-$(CONFIG_TIFM_7XX1) += tifm_7xx1.o |
21 | obj-$(CONFIG_PHANTOM) += phantom.o | 14 | obj-$(CONFIG_PHANTOM) += phantom.o |
22 | obj-$(CONFIG_SGI_IOC4) += ioc4.o | 15 | obj-$(CONFIG_SGI_IOC4) += ioc4.o |
23 | obj-$(CONFIG_SONY_LAPTOP) += sony-laptop.o | ||
24 | obj-$(CONFIG_THINKPAD_ACPI) += thinkpad_acpi.o | ||
25 | obj-$(CONFIG_FUJITSU_LAPTOP) += fujitsu-laptop.o | ||
26 | obj-$(CONFIG_PANASONIC_LAPTOP) += panasonic-laptop.o | ||
27 | obj-$(CONFIG_EEPROM_93CX6) += eeprom_93cx6.o | 16 | obj-$(CONFIG_EEPROM_93CX6) += eeprom_93cx6.o |
28 | obj-$(CONFIG_INTEL_MENLOW) += intel_menlow.o | ||
29 | obj-$(CONFIG_ENCLOSURE_SERVICES) += enclosure.o | 17 | obj-$(CONFIG_ENCLOSURE_SERVICES) += enclosure.o |
30 | obj-$(CONFIG_KGDB_TESTS) += kgdbts.o | 18 | obj-$(CONFIG_KGDB_TESTS) += kgdbts.o |
31 | obj-$(CONFIG_SGI_XP) += sgi-xp/ | 19 | obj-$(CONFIG_SGI_XP) += sgi-xp/ |
diff --git a/drivers/platform/Kconfig b/drivers/platform/Kconfig new file mode 100644 index 000000000000..9652c3fe7f5e --- /dev/null +++ b/drivers/platform/Kconfig | |||
@@ -0,0 +1,5 @@ | |||
1 | # drivers/platform/Kconfig | ||
2 | |||
3 | if X86 | ||
4 | source "drivers/platform/x86/Kconfig" | ||
5 | endif | ||
diff --git a/drivers/platform/Makefile b/drivers/platform/Makefile new file mode 100644 index 000000000000..782953ae4c03 --- /dev/null +++ b/drivers/platform/Makefile | |||
@@ -0,0 +1,5 @@ | |||
1 | # | ||
2 | # Makefile for linux/drivers/platform | ||
3 | # | ||
4 | |||
5 | obj-$(CONFIG_X86) += x86/ | ||
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig new file mode 100644 index 000000000000..0a9a5b9440af --- /dev/null +++ b/drivers/platform/x86/Kconfig | |||
@@ -0,0 +1,290 @@ | |||
1 | # | ||
2 | # X86 Platform Specific Drivers | ||
3 | # | ||
4 | |||
5 | menuconfig X86_PLATFORM_DEVICES | ||
6 | bool "X86 Platform Specific Device Drivers" | ||
7 | default y | ||
8 | ---help--- | ||
9 | Say Y here to get to see options for device drivers for various | ||
10 | x86 platforms, including vendor-specific laptop extension drivers. | ||
11 | This option alone does not add any kernel code. | ||
12 | |||
13 | If you say N, all options in this submenu will be skipped and disabled. | ||
14 | |||
15 | if X86_PLATFORM_DEVICES | ||
16 | |||
17 | config ACER_WMI | ||
18 | tristate "Acer WMI Laptop Extras (EXPERIMENTAL)" | ||
19 | depends on EXPERIMENTAL | ||
20 | depends on ACPI | ||
21 | depends on LEDS_CLASS | ||
22 | depends on NEW_LEDS | ||
23 | depends on BACKLIGHT_CLASS_DEVICE | ||
24 | depends on SERIO_I8042 | ||
25 | depends on RFKILL | ||
26 | select ACPI_WMI | ||
27 | ---help--- | ||
28 | This is a driver for newer Acer (and Wistron) laptops. It adds | ||
29 | wireless radio and bluetooth control, and on some laptops, | ||
30 | exposes the mail LED and LCD backlight. | ||
31 | |||
32 | For more information about this driver see | ||
33 | <file:Documentation/laptops/acer-wmi.txt> | ||
34 | |||
35 | If you have an ACPI-WMI compatible Acer/ Wistron laptop, say Y or M | ||
36 | here. | ||
37 | |||
38 | config ASUS_LAPTOP | ||
39 | tristate "Asus Laptop Extras (EXPERIMENTAL)" | ||
40 | depends on ACPI | ||
41 | depends on EXPERIMENTAL && !ACPI_ASUS | ||
42 | depends on LEDS_CLASS | ||
43 | depends on NEW_LEDS | ||
44 | depends on BACKLIGHT_CLASS_DEVICE | ||
45 | ---help--- | ||
46 | This is the new Linux driver for Asus laptops. It may also support some | ||
47 | MEDION, JVC or VICTOR laptops. It makes all the extra buttons generate | ||
48 | standard ACPI events that go through /proc/acpi/events. It also adds | ||
49 | support for video output switching, LCD backlight control, Bluetooth and | ||
50 | Wlan control, and most importantly, allows you to blink those fancy LEDs. | ||
51 | |||
52 | For more information and a userspace daemon for handling the extra | ||
53 | buttons see <http://acpi4asus.sf.net/>. | ||
54 | |||
55 | If you have an ACPI-compatible ASUS laptop, say Y or M here. | ||
56 | |||
57 | config FUJITSU_LAPTOP | ||
58 | tristate "Fujitsu Laptop Extras" | ||
59 | depends on ACPI | ||
60 | depends on INPUT | ||
61 | depends on BACKLIGHT_CLASS_DEVICE | ||
62 | ---help--- | ||
63 | This is a driver for laptops built by Fujitsu: | ||
64 | |||
65 | * P2xxx/P5xxx/S6xxx/S7xxx series Lifebooks | ||
66 | * Possibly other Fujitsu laptop models | ||
67 | * Tested with S6410 and S7020 | ||
68 | |||
69 | It adds support for LCD brightness control and some hotkeys. | ||
70 | |||
71 | If you have a Fujitsu laptop, say Y or M here. | ||
72 | |||
73 | config FUJITSU_LAPTOP_DEBUG | ||
74 | bool "Verbose debug mode for Fujitsu Laptop Extras" | ||
75 | depends on FUJITSU_LAPTOP | ||
76 | default n | ||
77 | ---help--- | ||
78 | Enables extra debug output from the fujitsu extras driver, at the | ||
79 | expense of a slight increase in driver size. | ||
80 | |||
81 | If you are not sure, say N here. | ||
82 | |||
83 | config TC1100_WMI | ||
84 | tristate "HP Compaq TC1100 Tablet WMI Extras (EXPERIMENTAL)" | ||
85 | depends on !X86_64 | ||
86 | depends on EXPERIMENTAL | ||
87 | depends on ACPI | ||
88 | select ACPI_WMI | ||
89 | ---help--- | ||
90 | This is a driver for the WMI extensions (wireless and bluetooth power | ||
91 | control) of the HP Compaq TC1100 tablet. | ||
92 | |||
93 | config HP_WMI | ||
94 | tristate "HP WMI extras" | ||
95 | depends on ACPI_WMI | ||
96 | depends on INPUT | ||
97 | depends on RFKILL | ||
98 | help | ||
99 | Say Y here if you want to support WMI-based hotkeys on HP laptops and | ||
100 | to read data from WMI such as docking or ambient light sensor state. | ||
101 | |||
102 | To compile this driver as a module, choose M here: the module will | ||
103 | be called hp-wmi. | ||
104 | |||
105 | config MSI_LAPTOP | ||
106 | tristate "MSI Laptop Extras" | ||
107 | depends on ACPI | ||
108 | depends on BACKLIGHT_CLASS_DEVICE | ||
109 | ---help--- | ||
110 | This is a driver for laptops built by MSI (MICRO-STAR | ||
111 | INTERNATIONAL): | ||
112 | |||
113 | MSI MegaBook S270 (MS-1013) | ||
114 | Cytron/TCM/Medion/Tchibo MD96100/SAM2000 | ||
115 | |||
116 | It adds support for Bluetooth, WLAN and LCD brightness control. | ||
117 | |||
118 | More information about this driver is available at | ||
119 | <http://0pointer.de/lennart/tchibo.html>. | ||
120 | |||
121 | If you have an MSI S270 laptop, say Y or M here. | ||
122 | |||
123 | config PANASONIC_LAPTOP | ||
124 | tristate "Panasonic Laptop Extras" | ||
125 | depends on INPUT && ACPI | ||
126 | depends on BACKLIGHT_CLASS_DEVICE | ||
127 | ---help--- | ||
128 | This driver adds support for access to backlight control and hotkeys | ||
129 | on Panasonic Let's Note laptops. | ||
130 | |||
131 | If you have a Panasonic Let's note laptop (such as the R1(N variant), | ||
132 | R2, R3, R5, T2, W2 and Y2 series), say Y. | ||
133 | |||
134 | config COMPAL_LAPTOP | ||
135 | tristate "Compal Laptop Extras" | ||
136 | depends on ACPI | ||
137 | depends on BACKLIGHT_CLASS_DEVICE | ||
138 | ---help--- | ||
139 | This is a driver for laptops built by Compal: | ||
140 | |||
141 | Compal FL90/IFL90 | ||
142 | Compal FL91/IFL91 | ||
143 | Compal FL92/JFL92 | ||
144 | Compal FT00/IFT00 | ||
145 | |||
146 | It adds support for Bluetooth, WLAN and LCD brightness control. | ||
147 | |||
148 | If you have an Compal FL9x/IFL9x/FT00 laptop, say Y or M here. | ||
149 | |||
150 | config SONY_LAPTOP | ||
151 | tristate "Sony Laptop Extras" | ||
152 | depends on ACPI | ||
153 | select BACKLIGHT_CLASS_DEVICE | ||
154 | depends on INPUT | ||
155 | ---help--- | ||
156 | This mini-driver drives the SNC and SPIC devices present in the ACPI | ||
157 | BIOS of the Sony Vaio laptops. | ||
158 | |||
159 | It gives access to some extra laptop functionalities like Bluetooth, | ||
160 | screen brightness control, Fn keys and allows powering on/off some | ||
161 | devices. | ||
162 | |||
163 | Read <file:Documentation/laptops/sony-laptop.txt> for more information. | ||
164 | |||
165 | config SONYPI_COMPAT | ||
166 | bool "Sonypi compatibility" | ||
167 | depends on SONY_LAPTOP | ||
168 | ---help--- | ||
169 | Build the sonypi driver compatibility code into the sony-laptop driver. | ||
170 | |||
171 | config THINKPAD_ACPI | ||
172 | tristate "ThinkPad ACPI Laptop Extras" | ||
173 | depends on ACPI | ||
174 | select BACKLIGHT_LCD_SUPPORT | ||
175 | select BACKLIGHT_CLASS_DEVICE | ||
176 | select HWMON | ||
177 | select NVRAM | ||
178 | select INPUT | ||
179 | select NEW_LEDS | ||
180 | select LEDS_CLASS | ||
181 | select NET | ||
182 | select RFKILL | ||
183 | ---help--- | ||
184 | This is a driver for the IBM and Lenovo ThinkPad laptops. It adds | ||
185 | support for Fn-Fx key combinations, Bluetooth control, video | ||
186 | output switching, ThinkLight control, UltraBay eject and more. | ||
187 | For more information about this driver see | ||
188 | <file:Documentation/laptops/thinkpad-acpi.txt> and | ||
189 | <http://ibm-acpi.sf.net/> . | ||
190 | |||
191 | This driver was formerly known as ibm-acpi. | ||
192 | |||
193 | If you have an IBM or Lenovo ThinkPad laptop, say Y or M here. | ||
194 | |||
195 | config THINKPAD_ACPI_DEBUG | ||
196 | bool "Verbose debug mode" | ||
197 | depends on THINKPAD_ACPI | ||
198 | default n | ||
199 | ---help--- | ||
200 | Enables extra debugging information, at the expense of a slightly | ||
201 | increase in driver size. | ||
202 | |||
203 | If you are not sure, say N here. | ||
204 | |||
205 | config THINKPAD_ACPI_DOCK | ||
206 | bool "Legacy Docking Station Support" | ||
207 | depends on THINKPAD_ACPI | ||
208 | depends on ACPI_DOCK=n | ||
209 | default n | ||
210 | ---help--- | ||
211 | Allows the thinkpad_acpi driver to handle docking station events. | ||
212 | This support was made obsolete by the generic ACPI docking station | ||
213 | support (CONFIG_ACPI_DOCK). It will allow locking and removing the | ||
214 | laptop from the docking station, but will not properly connect PCI | ||
215 | devices. | ||
216 | |||
217 | If you are not sure, say N here. | ||
218 | |||
219 | config THINKPAD_ACPI_BAY | ||
220 | bool "Legacy Removable Bay Support" | ||
221 | depends on THINKPAD_ACPI | ||
222 | default y | ||
223 | ---help--- | ||
224 | Allows the thinkpad_acpi driver to handle removable bays. It will | ||
225 | electrically disable the device in the bay, and also generate | ||
226 | notifications when the bay lever is ejected or inserted. | ||
227 | |||
228 | If you are not sure, say Y here. | ||
229 | |||
230 | config THINKPAD_ACPI_VIDEO | ||
231 | bool "Video output control support" | ||
232 | depends on THINKPAD_ACPI | ||
233 | default y | ||
234 | ---help--- | ||
235 | Allows the thinkpad_acpi driver to provide an interface to control | ||
236 | the various video output ports. | ||
237 | |||
238 | This feature often won't work well, depending on ThinkPad model, | ||
239 | display state, video output devices in use, whether there is a X | ||
240 | server running, phase of the moon, and the current mood of | ||
241 | Schroedinger's cat. If you can use X.org's RandR to control | ||
242 | your ThinkPad's video output ports instead of this feature, | ||
243 | don't think twice: do it and say N here to save some memory. | ||
244 | |||
245 | If you are not sure, say Y here. | ||
246 | |||
247 | config THINKPAD_ACPI_HOTKEY_POLL | ||
248 | bool "Support NVRAM polling for hot keys" | ||
249 | depends on THINKPAD_ACPI | ||
250 | default y | ||
251 | ---help--- | ||
252 | Some thinkpad models benefit from NVRAM polling to detect a few of | ||
253 | the hot key press events. If you know your ThinkPad model does not | ||
254 | need to do NVRAM polling to support any of the hot keys you use, | ||
255 | unselecting this option will save about 1kB of memory. | ||
256 | |||
257 | ThinkPads T40 and newer, R52 and newer, and X31 and newer are | ||
258 | unlikely to need NVRAM polling in their latest BIOS versions. | ||
259 | |||
260 | NVRAM polling can detect at most the following keys: ThinkPad/Access | ||
261 | IBM, Zoom, Switch Display (fn+F7), ThinkLight, Volume up/down/mute, | ||
262 | Brightness up/down, Display Expand (fn+F8), Hibernate (fn+F12). | ||
263 | |||
264 | If you are not sure, say Y here. The driver enables polling only if | ||
265 | it is strictly necessary to do so. | ||
266 | |||
267 | config INTEL_MENLOW | ||
268 | tristate "Thermal Management driver for Intel menlow platform" | ||
269 | depends on ACPI_THERMAL | ||
270 | select THERMAL | ||
271 | ---help--- | ||
272 | ACPI thermal management enhancement driver on | ||
273 | Intel Menlow platform. | ||
274 | |||
275 | If unsure, say N. | ||
276 | |||
277 | config EEEPC_LAPTOP | ||
278 | tristate "Eee PC Hotkey Driver (EXPERIMENTAL)" | ||
279 | depends on ACPI | ||
280 | depends on BACKLIGHT_CLASS_DEVICE | ||
281 | depends on HWMON | ||
282 | depends on EXPERIMENTAL | ||
283 | depends on RFKILL | ||
284 | ---help--- | ||
285 | This driver supports the Fn-Fx keys on Eee PC laptops. | ||
286 | It also adds the ability to switch camera/wlan on/off. | ||
287 | |||
288 | If you have an Eee PC laptop, say Y or M here. | ||
289 | |||
290 | endif # X86_PLATFORM_DEVICES | ||
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile new file mode 100644 index 000000000000..4d26b1bf22ae --- /dev/null +++ b/drivers/platform/x86/Makefile | |||
@@ -0,0 +1,16 @@ | |||
1 | # | ||
2 | # Makefile for linux/drivers/platform/x86 | ||
3 | # x86 Platform-Specific Drivers | ||
4 | # | ||
5 | obj-$(CONFIG_ASUS_LAPTOP) += asus-laptop.o | ||
6 | obj-$(CONFIG_EEEPC_LAPTOP) += eeepc-laptop.o | ||
7 | obj-$(CONFIG_MSI_LAPTOP) += msi-laptop.o | ||
8 | obj-$(CONFIG_COMPAL_LAPTOP) += compal-laptop.o | ||
9 | obj-$(CONFIG_ACER_WMI) += acer-wmi.o | ||
10 | obj-$(CONFIG_HP_WMI) += hp-wmi.o | ||
11 | obj-$(CONFIG_TC1100_WMI) += tc1100-wmi.o | ||
12 | obj-$(CONFIG_SONY_LAPTOP) += sony-laptop.o | ||
13 | obj-$(CONFIG_THINKPAD_ACPI) += thinkpad_acpi.o | ||
14 | obj-$(CONFIG_FUJITSU_LAPTOP) += fujitsu-laptop.o | ||
15 | obj-$(CONFIG_PANASONIC_LAPTOP) += panasonic-laptop.o | ||
16 | obj-$(CONFIG_INTEL_MENLOW) += intel_menlow.o | ||
diff --git a/drivers/misc/acer-wmi.c b/drivers/platform/x86/acer-wmi.c index 94c9f911824e..94c9f911824e 100644 --- a/drivers/misc/acer-wmi.c +++ b/drivers/platform/x86/acer-wmi.c | |||
diff --git a/drivers/misc/asus-laptop.c b/drivers/platform/x86/asus-laptop.c index 8fb8b3591048..8fb8b3591048 100644 --- a/drivers/misc/asus-laptop.c +++ b/drivers/platform/x86/asus-laptop.c | |||
diff --git a/drivers/misc/compal-laptop.c b/drivers/platform/x86/compal-laptop.c index 11003bba10d3..11003bba10d3 100644 --- a/drivers/misc/compal-laptop.c +++ b/drivers/platform/x86/compal-laptop.c | |||
diff --git a/drivers/misc/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c index 02fe2b8b8939..02fe2b8b8939 100644 --- a/drivers/misc/eeepc-laptop.c +++ b/drivers/platform/x86/eeepc-laptop.c | |||
diff --git a/drivers/misc/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c index a7dd3e9fb79d..a7dd3e9fb79d 100644 --- a/drivers/misc/fujitsu-laptop.c +++ b/drivers/platform/x86/fujitsu-laptop.c | |||
diff --git a/drivers/misc/hp-wmi.c b/drivers/platform/x86/hp-wmi.c index 4b7c24c519c3..4b7c24c519c3 100644 --- a/drivers/misc/hp-wmi.c +++ b/drivers/platform/x86/hp-wmi.c | |||
diff --git a/drivers/misc/intel_menlow.c b/drivers/platform/x86/intel_menlow.c index 27b7662955bb..27b7662955bb 100644 --- a/drivers/misc/intel_menlow.c +++ b/drivers/platform/x86/intel_menlow.c | |||
diff --git a/drivers/misc/msi-laptop.c b/drivers/platform/x86/msi-laptop.c index 759763d18e4c..759763d18e4c 100644 --- a/drivers/misc/msi-laptop.c +++ b/drivers/platform/x86/msi-laptop.c | |||
diff --git a/drivers/misc/panasonic-laptop.c b/drivers/platform/x86/panasonic-laptop.c index 4a1bc64485d5..4a1bc64485d5 100644 --- a/drivers/misc/panasonic-laptop.c +++ b/drivers/platform/x86/panasonic-laptop.c | |||
diff --git a/drivers/misc/sony-laptop.c b/drivers/platform/x86/sony-laptop.c index 571b211608d1..571b211608d1 100644 --- a/drivers/misc/sony-laptop.c +++ b/drivers/platform/x86/sony-laptop.c | |||
diff --git a/drivers/misc/tc1100-wmi.c b/drivers/platform/x86/tc1100-wmi.c index f25e4c974dcf..f25e4c974dcf 100644 --- a/drivers/misc/tc1100-wmi.c +++ b/drivers/platform/x86/tc1100-wmi.c | |||
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index 899766e16fa8..899766e16fa8 100644 --- a/drivers/misc/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c | |||