Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

[powerpc.git] / drivers / i2c / busses / Kconfig

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index d6d4494..90f91d0 100644 (file)
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -75,11 +75,11 @@ config I2C_AMD8111
          will be called i2c-amd8111.
 
 config I2C_AU1550
          will be called i2c-amd8111.
 
 config I2C_AU1550

-       tristate "Au1550 SMBus interface"
-       depends on I2C && SOC_AU1550
+       tristate "Au1550/Au1200 SMBus interface"
+       depends on I2C && (SOC_AU1550 || SOC_AU1200)

        help
          If you say yes to this option, support will be included for the
        help
          If you say yes to this option, support will be included for the

-         Au1550 SMBus interface.
+         Au1550 and Au1200 SMBus interface.

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


@@ -125,6 +125,7 @@ config I2C_I801
            ICH7
            ESB2
            ICH8
            ICH7
            ESB2
            ICH8

+           ICH9

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


@@ -163,7 +164,7 @@ config I2C_PXA_SLAVE
          I2C bus.
 
 config I2C_PIIX4
          I2C bus.
 
 config I2C_PIIX4

-       tristate "Intel PIIX4"
+       tristate "Intel PIIX4 and compatible (ATI/Serverworks/Broadcom/SMSC)"

        depends on I2C && PCI
        help
          If you say yes to this option, support will be included for the Intel
        depends on I2C && PCI
        help
          If you say yes to this option, support will be included for the Intel


@@ -172,6 +173,9 @@ config I2C_PIIX4
          of Broadcom):
            Intel PIIX4
            Intel 440MX
          of Broadcom):
            Intel PIIX4
            Intel 440MX

+           ATI IXP200
+           ATI IXP300
+           ATI IXP400

            Serverworks OSB4
            Serverworks CSB5
            Serverworks CSB6
            Serverworks OSB4
            Serverworks CSB5
            Serverworks CSB6


@@ -192,11 +196,11 @@ config I2C_IBM_IIC
          will be called i2c-ibm_iic.
 
 config I2C_IOP3XX
          will be called i2c-ibm_iic.
 
 config I2C_IOP3XX

-       tristate "Intel IOP3xx and IXP4xx on-chip I2C interface"
-       depends on (ARCH_IOP3XX || ARCH_IXP4XX) && I2C
+       tristate "Intel IOPx3xx and IXP4xx on-chip I2C interface"
+       depends on (ARCH_IOP32X || ARCH_IOP33X || ARCH_IXP4XX || ARCH_IOP13XX) && I2C

        help
          Say Y here if you want to use the IIC bus controller on
        help
          Say Y here if you want to use the IIC bus controller on

-         the Intel IOP3xx I/O Processors or IXP4xx Network Processors.
+         the Intel IOPx3xx I/O Processors or IXP4xx Network Processors.

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


@@ -252,12 +256,12 @@ config I2C_POWERMAC
          will be called i2c-powermac.
 
 config I2C_MPC
          will be called i2c-powermac.
 
 config I2C_MPC

-       tristate "MPC107/824x/85xx/52xx"
+       tristate "MPC107/824x/85xx/52xx/86xx"

        depends on I2C && PPC32
        help
          If you say yes to this option, support will be included for the
          built-in I2C interface on the MPC107/Tsi107/MPC8240/MPC8245 and
        depends on I2C && PPC32
        help
          If you say yes to this option, support will be included for the
          built-in I2C interface on the MPC107/Tsi107/MPC8240/MPC8245 and

-         MPC85xx family processors. The driver may also work on 52xx
+         MPC85xx/MPC8641 family processors. The driver may also work on 52xx

          family processors, though interrupts are known not to work.
 
          This driver can also be built as a module.  If so, the module
          family processors, though interrupts are known not to work.
 
          This driver can also be built as a module.  If so, the module


@@ -273,6 +277,27 @@ config I2C_NFORCE2
          This driver can also be built as a module.  If so, the module
          will be called i2c-nforce2.
 
          This driver can also be built as a module.  If so, the module
          will be called i2c-nforce2.
 

+config I2C_OCORES
+       tristate "OpenCores I2C Controller"
+       depends on I2C && EXPERIMENTAL
+       help
+         If you say yes to this option, support will be included for the
+         OpenCores I2C controller. For details see
+         http://www.opencores.org/projects.cgi/web/i2c/overview
+
+         This driver can also be built as a module.  If so, the module
+         will be called i2c-ocores.
+
+config I2C_OMAP
+       tristate "OMAP I2C adapter"
+       depends on I2C && ARCH_OMAP
+       default y if MACH_OMAP_H3 || MACH_OMAP_OSK
+       help
+         If you say yes to this option, support will be included for the
+         I2C interface on the Texas Instruments OMAP1/2 family of processors.
+         Like OMAP1510/1610/1710/5912 and OMAP242x.
+         For details see http://www.ti.com/omap.
+

 config I2C_PARPORT
        tristate "Parallel port adapter"
        depends on I2C && PARPORT
 config I2C_PARPORT
        tristate "Parallel port adapter"
        depends on I2C && PARPORT


@@ -309,10 +334,10 @@ config I2C_PARPORT_LIGHT
 
          This driver is a light version of i2c-parport.  It doesn't depend
          on the parport driver, and uses direct I/O access instead.  This
 
          This driver is a light version of i2c-parport.  It doesn't depend
          on the parport driver, and uses direct I/O access instead.  This

-         might be prefered on embedded systems where wasting memory for
+         might be preferred on embedded systems where wasting memory for

          the clean but heavy parport handling is not an option.  The
          drawback is a reduced portability and the impossibility to
          the clean but heavy parport handling is not an option.  The
          drawback is a reduced portability and the impossibility to

-         dasiy-chain other parallel port devices.
+         daisy-chain other parallel port devices.

          
          Don't say Y here if you said Y or M to i2c-parport.  Saying M to
          both is possible but both modules should not be loaded at the same
          
          Don't say Y here if you said Y or M to i2c-parport.  Saying M to
          both is possible but both modules should not be loaded at the same


@@ -468,19 +493,19 @@ config I2C_VIA
          will be called i2c-via.
 
 config I2C_VIAPRO
          will be called i2c-via.
 
 config I2C_VIAPRO

-       tristate "VIA 82C596/82C686/823x"
+       tristate "VIA 82C596/82C686/82xx"

        depends on I2C && PCI
        help
          If you say yes to this option, support will be included for the VIA
        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:
          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.
 
          This driver can also be built as a module.  If so, the module
          will be called i2c-viapro.


@@ -500,6 +525,7 @@ config I2C_PCA_ISA
        tristate "PCA9564 on an ISA bus"
        depends on I2C
        select I2C_ALGOPCA
        tristate "PCA9564 on an ISA bus"
        depends on I2C
        select I2C_ALGOPCA

+       default n

        help
          This driver supports ISA boards using the Philips PCA 9564
          Parallel bus to I2C bus controller
        help
          This driver supports ISA boards using the Philips PCA 9564
          Parallel bus to I2C bus controller


@@ -507,6 +533,11 @@ config I2C_PCA_ISA
          This driver can also be built as a module.  If so, the module
          will be called i2c-pca-isa.
 
          This driver can also be built as a module.  If so, the module
          will be called i2c-pca-isa.
 

+         This device is almost undetectable and using this driver on a
+         system which doesn't have this device will result in long
+         delays when I2C/SMBus chip drivers are loaded (e.g. at boot
+         time).  If unsure, say N.
+

 config I2C_MV64XXX
        tristate "Marvell mv64xxx I2C Controller"
        depends on I2C && MV64X60 && EXPERIMENTAL
 config I2C_MV64XXX
        tristate "Marvell mv64xxx I2C Controller"
        depends on I2C && MV64X60 && EXPERIMENTAL