Subject: [PATCH] [acpi driver model] Move (and clean up) driver config options - Move config options for all ACPI drivers to drivers/acpi/drivers/legacy/Kconfig - Don't change any dependencies. - Alphabetize the options. - Move platform-specific options under their own menu. Signed-off-by: Patrick Mochel --- drivers/acpi/Kconfig | 207 +-------------------------------- drivers/acpi/drivers/Kconfig | 3 drivers/acpi/drivers/legacy/Kconfig | 219 +++++++++++++++++++++++++++++++++++ 3 files changed, 226 insertions(+), 203 deletions(-) create mode 100644 drivers/acpi/drivers/legacy/Kconfig applies-to: 38611514c188d5352c8921c7afe3881a48f38367 8d2bfcd09df74b0178e050edef8af4a5858a0573 diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 4e3904d..5e4674e 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -71,8 +71,6 @@ config ACPI_SLEEP_PROC_FS default y -source drivers/acpi/drivers/Kconfig - config ACPI_SLEEP_PROC_SLEEP bool "/proc/acpi/sleep (deprecated)" depends on ACPI_SLEEP_PROC_FS @@ -81,161 +79,6 @@ config ACPI_SLEEP_PROC_SLEEP Create /proc/acpi/sleep Deprecated by /sys/power/state -config ACPI_AC - tristate "AC Adapter" - depends on X86 - default y - help - This driver adds support for the AC Adapter object, which indicates - whether a system is on AC, or not. If you have a system that can - switch between A/C and battery, say Y. - -config ACPI_BATTERY - tristate "Battery" - depends on X86 - default y - help - This driver adds support for battery information through - /proc/acpi/battery. If you have a mobile system with a battery, - say Y. - -config ACPI_BUTTON - tristate "Button" - default y - help - This driver handles events on the power, sleep and lid buttons. - A daemon reads /proc/acpi/event and perform user-defined actions - such as shutting down the system. This is necessary for - software controlled poweroff. - -config ACPI_VIDEO - tristate "Video" - depends on X86 - default y - help - This driver implement the ACPI Extensions For Display Adapters - for integrated graphics devices on motherboard, as specified in - ACPI 2.0 Specification, Appendix B, allowing to perform some basic - control like defining the video POST device, retrieving EDID information - or to setup a video output, etc. - Note that this is an ref. implementation only. It may or may not work - for your integrated video device. - -config ACPI_HOTKEY - tristate "Generic Hotkey (EXPERIMENTAL)" - depends on EXPERIMENTAL - depends on X86 - default n - help - Experimental consolidated hotkey driver. - If you are unsure, say N. - -config ACPI_FAN - tristate "Fan" - default y - help - This driver adds support for ACPI fan devices, allowing user-mode - applications to perform basic fan control (on, off, status). - -config ACPI_PROCESSOR - tristate "Processor" - default y - help - This driver installs ACPI as the idle handler for Linux, and uses - ACPI C2 and C3 processor states to save power, on systems that - support it. It is required by several flavors of cpufreq - Performance-state drivers. - -config ACPI_HOTPLUG_CPU - bool - depends on ACPI_PROCESSOR && HOTPLUG_CPU - select ACPI_CONTAINER - default y - -config ACPI_THERMAL - tristate "Thermal Zone" - depends on ACPI_PROCESSOR - default y - help - This driver adds support for ACPI thermal zones. Most mobile and - some desktop systems support ACPI thermal zones. It is HIGHLY - recommended that this option be enabled, as your processor(s) - may be damaged without it. - -config ACPI_NUMA - bool "NUMA support" - depends on NUMA - depends on (IA64 || X86_64) - default y if IA64_GENERIC || IA64_SGI_SN2 - -config ACPI_ASUS - tristate "ASUS/Medion Laptop Extras" - depends on X86 - default y - ---help--- - This driver provides support for extra features of ACPI-compatible - ASUS laptops. As some of Medion laptops are made by ASUS, it may also - support some Medion laptops (such as 9675 for example). It makes all - the extra buttons generate standard ACPI events that go through - /proc/acpi/events, and (on some models) adds support for changing the - display brightness and output, switching the LCD backlight on and off, - and most importantly, allows you to blink those fancy LEDs intended - for reporting mail and wireless status. - - Note: display switching code is currently considered EXPERIMENTAL, - toying with these values may even lock your machine. - - All settings are changed via /proc/acpi/asus directory entries. Owner - and group for these entries can be set with asus_uid and asus_gid - parameters. - - More information and a userspace daemon for handling the extra buttons - at . - - If you have an ACPI-compatible ASUS laptop, say Y or M here. This - driver is still under development, so if your laptop is unsupported or - something works not quite as expected, please use the mailing list - available on the above page (acpi4asus-user@lists.sourceforge.net) - -config ACPI_IBM - tristate "IBM ThinkPad Laptop Extras" - depends on X86 - ---help--- - This is a Linux ACPI driver for the IBM ThinkPad laptops. It adds - support for Fn-Fx key combinations, Bluetooth control, video - output switching, ThinkLight control, UltraBay eject and more. - For more information about this driver see - and . - - If you have an IBM ThinkPad laptop, say Y or M here. - -config ACPI_TOSHIBA - tristate "Toshiba Laptop Extras" - depends on X86 - default y - ---help--- - This driver adds support for access to certain system settings - on "legacy free" Toshiba laptops. These laptops can be recognized by - their lack of a BIOS setup menu and APM support. - - On these machines, all system configuration is handled through the - ACPI. This driver is required for access to controls not covered - by the general ACPI drivers, such as LCD brightness, video output, - etc. - - This driver differs from the non-ACPI Toshiba laptop driver (located - under "Processor type and features") in several aspects. - Configuration is accessed by reading and writing text files in the - /proc tree instead of by program interface to /dev. Furthermore, no - power management functions are exposed, as those are handled by the - general ACPI drivers. - - More information about this driver is available at - . - - If you have a legacy free Toshiba laptop (such as the Libretto L1 - series), say Y. - config ACPI_CUSTOM_DSDT bool "Include Custom DSDT" depends on !STANDALONE @@ -270,19 +113,6 @@ config ACPI_DEBUG of verbosity. Saying Y enables these statements. This will increase your kernel size by around 50K. -config ACPI_EC - bool - depends on X86 - default y - help - This driver is required on some systems for the proper operation of - the battery and thermal drivers. If you are compiling for a - mobile system, say Y. - -config ACPI_POWER - bool - default y - config ACPI_SYSTEM bool default y @@ -308,39 +138,10 @@ config X86_PM_TIMER kernel logs, and/or you are using this on a notebook which does not yet have an HPET, you should say "Y" here. -config ACPI_CONTAINER - tristate "ACPI0004,PNP0A05 and PNP0A06 Container Driver (EXPERIMENTAL)" - depends on EXPERIMENTAL - default (ACPI_HOTPLUG_MEMORY || ACPI_HOTPLUG_CPU || ACPI_HOTPLUG_IO) - ---help--- - This allows _physical_ insertion and removal of CPUs and memory. - This can be useful, for example, on NUMA machines that support - ACPI based physical hotplug of nodes, or non-NUMA machines that - support physical cpu/memory hot-plug. - - If one selects "m", this driver can be loaded with - "modprobe acpi_container". - -config ACPI_HOTPLUG_MEMORY - tristate "Memory Hotplug" - depends on ACPI - depends on MEMORY_HOTPLUG - default n - help - This driver adds supports for ACPI Memory Hotplug. This driver - provides support for fielding notifications on ACPI memory - devices (PNP0C80) which represent memory ranges that may be - onlined or offlined during runtime. - - Enabling this driver assumes that your platform hardware - and firmware have support for hot-plugging physical memory. If - your system does not support physically adding or ripping out - memory DIMMs at some platfrom defined granularity (individually - or as a bank) at runtime, then you need not enable this driver. - - If one selects "m," this driver can be loaded using the following - command: - $>modprobe acpi_memhotplug + +source drivers/acpi/drivers/Kconfig + + endif # ACPI endmenu diff --git a/drivers/acpi/drivers/Kconfig b/drivers/acpi/drivers/Kconfig index e5ea60e..5b43200 100644 --- a/drivers/acpi/drivers/Kconfig +++ b/drivers/acpi/drivers/Kconfig @@ -65,5 +65,8 @@ config ACPI_DM_SYSFS For more information on the interface that each driver exports, please see the documentation for that driver. + +source drivers/acpi/drivers/legacy/Kconfig + endmenu diff --git a/drivers/acpi/drivers/legacy/Kconfig b/drivers/acpi/drivers/legacy/Kconfig new file mode 100644 index 0000000..f91c87c --- /dev/null +++ b/drivers/acpi/drivers/legacy/Kconfig @@ -0,0 +1,219 @@ + +config ACPI_AC + tristate "AC Adapter" + depends on X86 + default y + help + This driver adds support for the AC Adapter object, which indicates + whether a system is on AC, or not. If you have a system that can + switch between A/C and battery, say Y. + + +config ACPI_BATTERY + tristate "Battery" + depends on X86 + default y + help + This driver adds support for battery information through + /proc/acpi/battery. If you have a mobile system with a battery, + say Y. + + +config ACPI_BUTTON + tristate "Button" + default y + help + This driver handles events on the power, sleep and lid buttons. + A daemon reads /proc/acpi/event and perform user-defined actions + such as shutting down the system. This is necessary for + software controlled poweroff. + + +config ACPI_CONTAINER + tristate "ACPI0004,PNP0A05 and PNP0A06 Container Driver (EXPERIMENTAL)" + depends on EXPERIMENTAL + default (ACPI_HOTPLUG_MEMORY || ACPI_HOTPLUG_CPU || ACPI_HOTPLUG_IO) + ---help--- + This allows _physical_ insertion and removal of CPUs and memory. + This can be useful, for example, on NUMA machines that support + ACPI based physical hotplug of nodes, or non-NUMA machines that + support physical cpu/memory hot-plug. + + If one selects "m", this driver can be loaded with + "modprobe acpi_container". + + +config ACPI_EC + bool + depends on X86 + default y + help + This driver is required on some systems for the proper operation of + the battery and thermal drivers. If you are compiling for a + mobile system, say Y. + + +config ACPI_FAN + tristate "Fan" + default y + help + This driver adds support for ACPI fan devices, allowing user-mode + applications to perform basic fan control (on, off, status). + + +config ACPI_HOTKEY + tristate "Generic Hotkey (EXPERIMENTAL)" + depends on EXPERIMENTAL + depends on X86 + default n + help + Experimental consolidated hotkey driver. + If you are unsure, say N. + + +config ACPI_HOTPLUG_MEMORY + tristate "Memory Hotplug" + depends on ACPI + depends on MEMORY_HOTPLUG + default n + help + This driver adds supports for ACPI Memory Hotplug. This driver + provides support for fielding notifications on ACPI memory + devices (PNP0C80) which represent memory ranges that may be + onlined or offlined during runtime. + + Enabling this driver assumes that your platform hardware + and firmware have support for hot-plugging physical memory. If + your system does not support physically adding or ripping out + memory DIMMs at some platfrom defined granularity (individually + or as a bank) at runtime, then you need not enable this driver. + + If one selects "m," this driver can be loaded using the following + command: + $>modprobe acpi_memhotplug + + +config ACPI_NUMA + bool "NUMA support" + depends on NUMA + depends on (IA64 || X86_64) + default y if IA64_GENERIC || IA64_SGI_SN2 + + +config ACPI_POWER + bool + default y + + +config ACPI_PROCESSOR + tristate "Processor" + default y + help + This driver installs ACPI as the idle handler for Linux, and uses + ACPI C2 and C3 processor states to save power, on systems that + support it. It is required by several flavors of cpufreq + Performance-state drivers. + +config ACPI_HOTPLUG_CPU + bool + depends on ACPI_PROCESSOR && HOTPLUG_CPU + select ACPI_CONTAINER + default y + + +config ACPI_THERMAL + tristate "Thermal Zone" + depends on ACPI_PROCESSOR + default y + help + This driver adds support for ACPI thermal zones. Most mobile and + some desktop systems support ACPI thermal zones. It is HIGHLY + recommended that this option be enabled, as your processor(s) + may be damaged without it. + + +config ACPI_VIDEO + tristate "Video" + depends on X86 + default y + help + This driver implement the ACPI Extensions For Display Adapters + for integrated graphics devices on motherboard, as specified in + ACPI 2.0 Specification, Appendix B, allowing to perform some basic + control like defining the video POST device, retrieving EDID information + or to setup a video output, etc. + Note that this is an ref. implementation only. It may or may not work + for your integrated video device. + + +menu "Platform-Specific Drivers" + +config ACPI_ASUS + tristate "ASUS/Medion Laptop Extras" + depends on X86 + default y + ---help--- + This driver provides support for extra features of ACPI-compatible + ASUS laptops. As some of Medion laptops are made by ASUS, it may also + support some Medion laptops (such as 9675 for example). It makes all + the extra buttons generate standard ACPI events that go through + /proc/acpi/events, and (on some models) adds support for changing the + display brightness and output, switching the LCD backlight on and off, + and most importantly, allows you to blink those fancy LEDs intended + for reporting mail and wireless status. + + Note: display switching code is currently considered EXPERIMENTAL, + toying with these values may even lock your machine. + + All settings are changed via /proc/acpi/asus directory entries. Owner + and group for these entries can be set with asus_uid and asus_gid + parameters. + + More information and a userspace daemon for handling the extra buttons + at . + + If you have an ACPI-compatible ASUS laptop, say Y or M here. This + driver is still under development, so if your laptop is unsupported or + something works not quite as expected, please use the mailing list + available on the above page (acpi4asus-user@lists.sourceforge.net) + +config ACPI_IBM + tristate "IBM ThinkPad Laptop Extras" + depends on X86 + ---help--- + This is a Linux ACPI driver for the IBM ThinkPad laptops. It adds + support for Fn-Fx key combinations, Bluetooth control, video + output switching, ThinkLight control, UltraBay eject and more. + For more information about this driver see + and . + + If you have an IBM ThinkPad laptop, say Y or M here. + +config ACPI_TOSHIBA + tristate "Toshiba Laptop Extras" + depends on X86 + default y + ---help--- + This driver adds support for access to certain system settings + on "legacy free" Toshiba laptops. These laptops can be recognized by + their lack of a BIOS setup menu and APM support. + + On these machines, all system configuration is handled through the + ACPI. This driver is required for access to controls not covered + by the general ACPI drivers, such as LCD brightness, video output, + etc. + + This driver differs from the non-ACPI Toshiba laptop driver (located + under "Processor type and features") in several aspects. + Configuration is accessed by reading and writing text files in the + /proc tree instead of by program interface to /dev. Furthermore, no + power management functions are exposed, as those are handled by the + general ACPI drivers. + + More information about this driver is available at + . + + If you have a legacy free Toshiba laptop (such as the Libretto L1 + series), say Y. + +endmenu --- 0.99.9.GIT