linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / i2c / busses / Kconfig

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index c58227e..0188a9d 100644 (file)
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -7,7 +7,7 @@ menu "I2C Hardware Bus support"
 
 config I2C_ALI1535
        tristate "ALI 1535"
-       depends on X86 && I2C && PCI && EXPERIMENTAL
+       depends on I2C && PCI
        help
          If you say yes to this option, support will be included for the SMB
          Host controller on Acer Labs Inc. (ALI) M1535 South Bridges.  The SMB
@@ -19,7 +19,7 @@ config I2C_ALI1535
 
 config I2C_ALI1563
        tristate "ALI 1563"
-       depends on X86 && I2C && PCI && EXPERIMENTAL
+       depends on I2C && PCI && EXPERIMENTAL
        help
          If you say yes to this option, support will be included for the SMB
          Host controller on Acer Labs Inc. (ALI) M1563 South Bridges.  The SMB
@@ -31,7 +31,7 @@ config I2C_ALI1563
 
 config I2C_ALI15X3
        tristate "ALI 15x3"
-       depends on (X86 || MIPS) && I2C && PCI && EXPERIMENTAL
+       depends on I2C && PCI
        help
          If you say yes to this option, support will be included for the
          Acer Labs Inc. (ALI) M1514 and M1543 motherboard I2C interfaces.
@@ -41,7 +41,7 @@ config I2C_ALI15X3
 
 config I2C_AMD756
        tristate "AMD 756/766/768/8111 and nVidia nForce"
-       depends on (X86 || PPC64 || ALPHA )&& I2C && PCI && EXPERIMENTAL
+       depends on I2C && PCI
        help
          If you say yes to this option, support will be included for the AMD
          756/766/768 mainboard I2C interfaces.  The driver also includes
@@ -53,7 +53,7 @@ config I2C_AMD756
 
 config I2C_AMD756_S4882
        tristate "SMBus multiplexing on the Tyan S4882"
-       depends on X86 && I2C_AMD756 && EXPERIMENTAL
+       depends on I2C_AMD756 && EXPERIMENTAL
        help
          Enabling this option will add specific SMBus support for the Tyan
          S4882 motherboard.  On this 4-CPU board, the SMBus is multiplexed
@@ -66,7 +66,7 @@ config I2C_AMD756_S4882
 
 config I2C_AMD8111
        tristate "AMD 8111"
-       depends on (X86 || PPC64) && I2C && PCI && EXPERIMENTAL
+       depends on I2C && PCI
        help
          If you say yes to this option, support will be included for the
          second (SMBus 2.0) AMD 8111 mainboard I2C interface.
@@ -109,7 +109,7 @@ config I2C_HYDRA
 
 config I2C_I801
        tristate "Intel 82801 (ICH)"
-       depends on X86 && I2C && PCI && EXPERIMENTAL
+       depends on I2C && PCI
        help
          If you say yes to this option, support will be included for the Intel
          801 family of mainboard I2C interfaces.  Specifically, the following
@@ -124,29 +124,48 @@ config I2C_I801
            ICH6
            ICH7
            ESB2
+           ICH8
+           ICH9
 
          This driver can also be built as a module.  If so, the module
          will be called i2c-i801.
 
 config I2C_I810
        tristate "Intel 810/815"
-       depends on X86 && I2C && PCI && EXPERIMENTAL
+       depends on I2C && PCI
        select I2C_ALGOBIT
        help
          If you say yes to this option, support will be included for the Intel
          810/815 family of mainboard I2C interfaces.  Specifically, the 
-         following versions of the chipset is supported:
+         following versions of the chipset are supported:
            i810AA
            i810AB
            i810E
            i815
+           i845G
 
          This driver can also be built as a module.  If so, the module
          will be called i2c-i810.
 
+config I2C_PXA
+       tristate "Intel PXA2XX I2C adapter (EXPERIMENTAL)"
+       depends on I2C && EXPERIMENTAL && ARCH_PXA
+       help
+         If you have devices in the PXA I2C bus, say yes to this option.
+         This driver can also be built as a module.  If so, the module
+         will be called i2c-pxa.
+
+config I2C_PXA_SLAVE
+       bool "Intel PXA2XX I2C Slave comms support"
+       depends on I2C_PXA
+       help
+         Support I2C slave mode communications on the PXA I2C bus.  This
+         is necessary for systems where the PXA may be a target on the
+         I2C bus.
+
 config I2C_PIIX4
        tristate "Intel PIIX4"
-       depends on (X86 || PPC || PPC64 || MIPS || MIPS64) && I2C && PCI
+       depends on I2C && PCI
        help
          If you say yes to this option, support will be included for the Intel
          PIIX4 family of mainboard I2C interfaces.  Specifically, the following
@@ -182,14 +201,8 @@ config I2C_IOP3XX
          will be called i2c-iop3xx.
 
 config I2C_ISA
-       tristate "ISA Bus support"
-       depends on I2C && EXPERIMENTAL
-       help
-         If you say yes to this option, support will be included for i2c
-         interfaces that are on the ISA bus.
-
-         This driver can also be built as a module.  If so, the module
-         will be called i2c-isa.
+       tristate
+       depends on I2C
 
 config I2C_ITE
        tristate "ITE I2C Adapter"
@@ -225,15 +238,17 @@ config I2C_IXP2000
          This support is also available as a module. If so, the module
          will be called i2c-ixp2000.
 
-config I2C_KEYWEST
-       tristate "Powermac Keywest I2C interface"
+config I2C_POWERMAC
+       tristate "Powermac I2C interface"
        depends on I2C && PPC_PMAC
+       default y
        help
-         This supports the use of the I2C interface in the combo-I/O
-         chip on recent Apple machines.  Say Y if you have such a machine.
+         This exposes the various PowerMac i2c interfaces to the linux i2c
+         layer and to userland. It is used by various drivers on the powemac
+         platform, thus should generally be enabled.
 
-         This support is also available as a module.  If so, the module 
-         will be called i2c-keywest.
+         This support is also available as a module.  If so, the module
+         will be called i2c-powermac.
 
 config I2C_MPC
        tristate "MPC107/824x/85xx/52xx"
@@ -248,12 +263,11 @@ config I2C_MPC
          will be called i2c-mpc.
 
 config I2C_NFORCE2
-       tristate "Nvidia Nforce2"
-       depends on I2C && PCI && EXPERIMENTAL
+       tristate "Nvidia nForce2, nForce3 and nForce4"
+       depends on I2C && PCI
        help
          If you say yes to this option, support will be included for the Nvidia
-         Nforce2 family of mainboard I2C interfaces.
-         This driver also supports the nForce3 Pro 150 MCP.
+         nForce2, nForce3 and nForce4 families of mainboard I2C interfaces.
 
          This driver can also be built as a module.  If so, the module
          will be called i2c-nforce2.
@@ -305,7 +319,7 @@ config I2C_PARPORT_LIGHT
 
 config I2C_PROSAVAGE
        tristate "S3/VIA (Pro)Savage"
-       depends on I2C && PCI && EXPERIMENTAL
+       depends on I2C && PCI
        select I2C_ALGOBIT
        help
          If you say yes to this option, support will be included for the
@@ -377,7 +391,7 @@ config SCx200_I2C_SDA
 
 config SCx200_ACB
        tristate "NatSemi SCx200 ACCESS.bus"
-       depends on SCx200 && PCI
+       depends on I2C && PCI
        help
          Enable the use of the ACCESS.bus controllers of a SCx200 processor.
 
@@ -388,7 +402,7 @@ config SCx200_ACB
 
 config I2C_SIS5595
        tristate "SiS 5595"
-       depends on X86 && I2C && PCI && EXPERIMENTAL
+       depends on I2C && PCI
        help
          If you say yes to this option, support will be included for the 
          SiS5595 SMBus (a subset of I2C) interface.
@@ -398,7 +412,7 @@ config I2C_SIS5595
 
 config I2C_SIS630
        tristate "SiS 630/730"
-       depends on X86 && I2C && PCI && EXPERIMENTAL
+       depends on I2C && PCI
        help
          If you say yes to this option, support will be included for the 
          SiS630 and SiS730 SMBus (a subset of I2C) interface.
@@ -408,7 +422,7 @@ config I2C_SIS630
 
 config I2C_SIS96X
        tristate "SiS 96x"
-       depends on X86 && I2C && PCI && EXPERIMENTAL
+       depends on I2C && PCI
        help
          If you say yes to this option, support will be included for the SiS
          96x SMBus (a subset of I2C) interfaces.  Specifically, the following
@@ -419,6 +433,7 @@ config I2C_SIS96X
            648/961
            650/961
            735
+           745
 
          This driver can also be built as a module.  If so, the module
          will be called i2c-sis96x.
@@ -438,7 +453,7 @@ config I2C_STUB
 
 config I2C_VIA
        tristate "VIA 82C586B"
-       depends on (X86 || PPC) && I2C && PCI && EXPERIMENTAL
+       depends on I2C && PCI && EXPERIMENTAL
        select I2C_ALGOBIT
        help
          If you say yes to this option, support will be included for the VIA
@@ -448,26 +463,26 @@ config I2C_VIA
          will be called i2c-via.
 
 config I2C_VIAPRO
-       tristate "VIA 82C596/82C686/823x"
-       depends on (X86 || PPC) && I2C && PCI && EXPERIMENTAL
+       tristate "VIA 82C596/82C686/82xx"
+       depends on I2C && PCI
        help
          If you say yes to this option, support will be included for the VIA
-         82C596/82C686/823x I2C interfaces.  Specifically, the following 
+         82C596/82C686/82xx I2C interfaces.  Specifically, the following
          chipsets are supported:
-         82C596A/B
-         82C686A/B
-         8231
-         8233
-         8233A
-         8235
-         8237
+           VT82C596A/B
+           VT82C686A/B
+           VT8231
+           VT8233/A
+           VT8235
+           VT8237R/A
+           VT8251
 
          This driver can also be built as a module.  If so, the module
          will be called i2c-viapro.
 
 config I2C_VOODOO3
        tristate "Voodoo 3"
-       depends on I2C && PCI && EXPERIMENTAL
+       depends on I2C && PCI
        select I2C_ALGOBIT
        help
          If you say yes to this option, support will be included for the