Pull bugzilla-9535 into release branch

[linux-2.6-omap-h63xx.git] / drivers / hwmon / Kconfig

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 9f01edeccac76a6d207119513453292d30ea540a..a0445bea9f75ade0411a2949fe0ff43f1ad75b32 100644 (file)
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -29,17 +29,34 @@ config HWMON_VID
        default n
 
 config SENSORS_ABITUGURU
        default n
 
 config SENSORS_ABITUGURU

-       tristate "Abit uGuru"
-       depends on EXPERIMENTAL
+       tristate "Abit uGuru (rev 1 & 2)"
+       depends on X86 && EXPERIMENTAL

        help
        help

-         If you say yes here you get support for the Abit uGuru chips
-         sensor part. The voltage and frequency control parts of the Abit
-         uGuru are not supported. The Abit uGuru chip can be found on Abit
-         uGuru featuring motherboards (most modern Abit motherboards).
+         If you say yes here you get support for the sensor part of the first
+         and second revision of the Abit uGuru chip. The voltage and frequency
+         control parts of the Abit uGuru are not supported. The Abit uGuru
+         chip can be found on Abit uGuru featuring motherboards (most modern
+         Abit motherboards from before end 2005). For more info and a list
+         of which motherboards have which revision see
+         Documentation/hwmon/abituguru

 
          This driver can also be built as a module.  If so, the module
          will be called abituguru.
 
 
          This driver can also be built as a module.  If so, the module
          will be called abituguru.
 

+config SENSORS_ABITUGURU3
+       tristate "Abit uGuru (rev 3)"
+       depends on X86 && EXPERIMENTAL
+       help
+         If you say yes here you get support for the sensor part of the
+         third revision of the Abit uGuru chip. Only reading the sensors
+         and their settings is supported. The third revision of the Abit
+         uGuru chip can be found on recent Abit motherboards (since end
+         2005). For more info and a list of which motherboards have which
+         revision see Documentation/hwmon/abituguru3
+
+         This driver can also be built as a module.  If so, the module
+         will be called abituguru3.
+

 config SENSORS_AD7418
        tristate "Analog Devices AD7416, AD7417 and AD7418"
        depends on I2C && EXPERIMENTAL
 config SENSORS_AD7418
        tristate "Analog Devices AD7416, AD7417 and AD7418"
        depends on I2C && EXPERIMENTAL


@@ -116,6 +133,16 @@ config SENSORS_ADM9240
          This driver can also be built as a module.  If so, the module
          will be called adm9240.
 
          This driver can also be built as a module.  If so, the module
          will be called adm9240.
 

+config SENSORS_ADT7470
+       tristate "Analog Devices ADT7470"
+       depends on I2C && EXPERIMENTAL
+       help
+         If you say yes here you get support for the Analog Devices
+         ADT7470 temperature monitoring chips.
+
+         This driver can also be built as a module. If so, the module
+         will be called adt7470.
+

 config SENSORS_K8TEMP
        tristate "AMD Athlon64/FX or Opteron temperature sensor"
        depends on X86 && PCI && EXPERIMENTAL
 config SENSORS_K8TEMP
        tristate "AMD Athlon64/FX or Opteron temperature sensor"
        depends on X86 && PCI && EXPERIMENTAL


@@ -131,6 +158,7 @@ config SENSORS_K8TEMP
 config SENSORS_AMS
        tristate "Apple Motion Sensor driver"
        depends on PPC_PMAC && !PPC64 && INPUT && ((ADB_PMU && I2C = y) || (ADB_PMU && !I2C) || I2C) && EXPERIMENTAL
 config SENSORS_AMS
        tristate "Apple Motion Sensor driver"
        depends on PPC_PMAC && !PPC64 && INPUT && ((ADB_PMU && I2C = y) || (ADB_PMU && !I2C) || I2C) && EXPERIMENTAL

+       select INPUT_POLLDEV

        help
          Support for the motion sensor included in PowerBooks. Includes
          implementations for PMU and I2C.
        help
          Support for the motion sensor included in PowerBooks. Includes
          implementations for PMU and I2C.


@@ -155,7 +183,7 @@ config SENSORS_AMS_I2C
 
 config SENSORS_ASB100
        tristate "Asus ASB100 Bach"
 
 config SENSORS_ASB100
        tristate "Asus ASB100 Bach"

-       depends on I2C && EXPERIMENTAL
+       depends on X86 && I2C && EXPERIMENTAL

        select HWMON_VID
        help
          If you say yes here you get support for the ASB100 Bach sensor
        select HWMON_VID
        help
          If you say yes here you get support for the ASB100 Bach sensor


@@ -188,20 +216,50 @@ config SENSORS_DS1621
          This driver can also be built as a module.  If so, the module
          will be called ds1621.
 
          This driver can also be built as a module.  If so, the module
          will be called ds1621.
 

+config SENSORS_I5K_AMB
+       tristate "FB-DIMM AMB temperature sensor on Intel 5000 series chipsets"
+       depends on PCI && EXPERIMENTAL
+       help
+         If you say yes here you get support for FB-DIMM AMB temperature
+         monitoring chips on systems with the Intel 5000 series chipset.
+
+         This driver can also be built as a module. If so, the module
+         will be called i5k_amb.
+

 config SENSORS_F71805F
 config SENSORS_F71805F

-       tristate "Fintek F71805F/FG and F71872F/FG"
+       tristate "Fintek F71805F/FG, F71806F/FG and F71872F/FG"

        depends on EXPERIMENTAL
        help
          If you say yes here you get support for hardware monitoring
        depends on EXPERIMENTAL
        help
          If you say yes here you get support for hardware monitoring

-         features of the Fintek F71805F/FG and F71872F/FG Super-I/O
-         chips.
+         features of the Fintek F71805F/FG, F71806F/FG and F71872F/FG
+         Super-I/O chips.

 
          This driver can also be built as a module.  If so, the module
          will be called f71805f.
 
 
          This driver can also be built as a module.  If so, the module
          will be called f71805f.
 

+config SENSORS_F71882FG
+       tristate "Fintek F71882FG and F71883FG"
+       depends on EXPERIMENTAL
+       help
+         If you say yes here you get support for hardware monitoring
+         features of the Fintek F71882FG and F71883FG Super-I/O chips.
+
+         This driver can also be built as a module.  If so, the module
+         will be called f71882fg.
+
+config SENSORS_F75375S
+       tristate "Fintek F75375S/SP and F75373";
+       depends on I2C && EXPERIMENTAL
+       help
+         If you say yes here you get support for hardware monitoring
+         features of the Fintek F75375S/SP and F75373
+
+         This driver can also be built as a module.  If so, the module
+         will be called f75375s.
+

 config SENSORS_FSCHER
        tristate "FSC Hermes"
 config SENSORS_FSCHER
        tristate "FSC Hermes"

-       depends on I2C
+       depends on X86 && I2C

        help
          If you say yes here you get support for Fujitsu Siemens
          Computers Hermes sensor chips.
        help
          If you say yes here you get support for Fujitsu Siemens
          Computers Hermes sensor chips.


@@ -211,7 +269,7 @@ config SENSORS_FSCHER
 
 config SENSORS_FSCPOS
        tristate "FSC Poseidon"
 
 config SENSORS_FSCPOS
        tristate "FSC Poseidon"

-       depends on I2C
+       depends on X86 && I2C

        help
          If you say yes here you get support for Fujitsu Siemens
          Computers Poseidon sensor chips.
        help
          If you say yes here you get support for Fujitsu Siemens
          Computers Poseidon sensor chips.


@@ -219,6 +277,20 @@ config SENSORS_FSCPOS
          This driver can also be built as a module.  If so, the module
          will be called fscpos.
 
          This driver can also be built as a module.  If so, the module
          will be called fscpos.
 

+config SENSORS_FSCHMD
+       tristate "FSC Poseidon, Scylla, Hermes, Heimdall and Heracles"
+       depends on X86 && I2C && EXPERIMENTAL
+       help
+         If you say yes here you get support for various Fujitsu Siemens
+         Computers sensor chips.
+
+         This is a new merged driver for FSC sensor chips which is intended
+         as a replacment for the fscpos, fscscy and fscher drivers and adds
+         support for several other FCS sensor chips.
+
+         This driver can also be built as a module.  If so, the module
+         will be called fschmd.
+

 config SENSORS_GL518SM
        tristate "Genesys Logic GL518SM"
        depends on I2C
 config SENSORS_GL518SM
        tristate "Genesys Logic GL518SM"
        depends on I2C


@@ -248,6 +320,19 @@ config SENSORS_CORETEMP
          sensor inside your CPU. Supported all are all known variants
          of Intel Core family.
 
          sensor inside your CPU. Supported all are all known variants
          of Intel Core family.
 

+config SENSORS_IBMPEX
+       tristate "IBM PowerExecutive temperature/power sensors"
+       select IPMI_SI
+       depends on IPMI_HANDLER
+       help
+         If you say yes here you get support for the temperature and
+         power sensors in various IBM System X servers that support
+         PowerExecutive.  So far this includes the x3550, x3650, x3655,
+         x3755, and certain HS20 blades.
+
+         This driver can also be built as a module.  If so, the module
+         will be called ibmpex.
+

 config SENSORS_IT87
        tristate "ITE IT87xx and compatibles"
        select HWMON_VID
 config SENSORS_IT87
        tristate "ITE IT87xx and compatibles"
        select HWMON_VID


@@ -382,6 +467,17 @@ config SENSORS_LM92
          This driver can also be built as a module.  If so, the module
          will be called lm92.
 
          This driver can also be built as a module.  If so, the module
          will be called lm92.
 

+config SENSORS_LM93
+       tristate "National Semiconductor LM93 and compatibles"
+       depends on I2C
+       select HWMON_VID
+       help
+         If you say yes here you get support for National Semiconductor LM93
+         sensor chips.
+
+         This driver can also be built as a module.  If so, the module
+         will be called lm93.
+

 config SENSORS_MAX1619
        tristate "Maxim MAX1619 sensor chip"
        depends on I2C
 config SENSORS_MAX1619
        tristate "Maxim MAX1619 sensor chip"
        depends on I2C


@@ -438,13 +534,13 @@ config SENSORS_SIS5595
          will be called sis5595.
 
 config SENSORS_DME1737
          will be called sis5595.
 
 config SENSORS_DME1737

-       tristate "SMSC DME1737 and compatibles"
+       tristate "SMSC DME1737, SCH311x and compatibles"

        depends on I2C && EXPERIMENTAL
        select HWMON_VID
        help
          If you say yes here you get support for the hardware monitoring
          and fan control features of the SMSC DME1737 (and compatibles
        depends on I2C && EXPERIMENTAL
        select HWMON_VID
        help
          If you say yes here you get support for the hardware monitoring
          and fan control features of the SMSC DME1737 (and compatibles

-         like the Asus A8000) Super-I/O chip.
+         like the Asus A8000) and SCH311x Super-I/O chips.

 
          This driver can also be built as a module.  If so, the module
          will be called dme1737.
 
          This driver can also be built as a module.  If so, the module
          will be called dme1737.


@@ -492,6 +588,16 @@ config SENSORS_SMSC47B397
          This driver can also be built as a module.  If so, the module
          will be called smsc47b397.
 
          This driver can also be built as a module.  If so, the module
          will be called smsc47b397.
 

+config SENSORS_THMC50
+       tristate "Texas Instruments THMC50 / Analog Devices ADM1022"
+       depends on I2C && EXPERIMENTAL
+       help
+         If you say yes here you get support for Texas Instruments THMC50
+         sensor chips and clones: the Analog Devices ADM1022.
+
+         This driver can also be built as a module.  If so, the module
+         will be called thmc50.
+

 config SENSORS_VIA686A
        tristate "VIA686A"
        depends on PCI
 config SENSORS_VIA686A
        tristate "VIA686A"
        depends on PCI


@@ -589,17 +695,16 @@ config SENSORS_W83627HF
          will be called w83627hf.
 
 config SENSORS_W83627EHF
          will be called w83627hf.
 
 config SENSORS_W83627EHF

-       tristate "Winbond W83627EHF"
-       depends on I2C && EXPERIMENTAL
-       select I2C_ISA
+       tristate "Winbond W83627EHF/DHG"
+       select HWMON_VID

        help
        help

-         If you say yes here you get preliminary support for the hardware
+         If you say yes here you get support for the hardware

          monitoring functionality of the Winbond W83627EHF Super-I/O chip.
          monitoring functionality of the Winbond W83627EHF Super-I/O chip.

-         Only fan and temperature inputs are supported at the moment, while
-         the chip does much more than that.

 
          This driver also supports the W83627EHG, which is the lead-free
 
          This driver also supports the W83627EHG, which is the lead-free

-         version of the W83627EHF.
+         version of the W83627EHF, and the W83627DHG, which is a similar
+         chip suited for specific Intel processors that use PECI such as
+         the Core 2 Duo.

 
          This driver can also be built as a module.  If so, the module
          will be called w83627ehf.
 
          This driver can also be built as a module.  If so, the module
          will be called w83627ehf.


@@ -607,6 +712,7 @@ config SENSORS_W83627EHF
 config SENSORS_HDAPS
        tristate "IBM Hard Drive Active Protection System (hdaps)"
        depends on INPUT && X86
 config SENSORS_HDAPS
        tristate "IBM Hard Drive Active Protection System (hdaps)"
        depends on INPUT && X86

+       select INPUT_POLLDEV

        default n
        help
          This driver provides support for the IBM Hard Drive Active Protection
        default n
        help
          This driver provides support for the IBM Hard Drive Active Protection


@@ -628,6 +734,7 @@ config SENSORS_APPLESMC
        depends on INPUT && X86
        select NEW_LEDS
        select LEDS_CLASS
        depends on INPUT && X86
        select NEW_LEDS
        select LEDS_CLASS

+       select INPUT_POLLDEV

        default n
        help
          This driver provides support for the Apple System Management
        default n
        help
          This driver provides support for the Apple System Management