ARM: OMAP3: Make I2C bus 2 configurable for BeagleBoard

I2C2 at BeagleBoard is connected to expansion connector, i.e. unused if
nothing is connected to this connector. As internal OMAP3 pull up resistors
are not strong enough, enabled but unused I2C2 bus results in error messages
(e.g. I2C timeouts). I2C2 should be enabled only if something is connected to
I2C2 at board's expansion connector and this extension has additional pull up
resistors for I2C2 bus.

- Add configuration option for this
- Use configuration option in board-omap3beagle
- While being there, add OMAP3 to OMAP I2C help text

Signed-off-by: Dirk Behme <dirk.behme@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
index 54969f333949cd61e45417e5649cd7c8c66a54bd..6981dc366c5e6040a6803b165bed700b899c79aa 100644 (file)
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -102,7 +102,9 @@ static struct omap_uart_config omap3_beagle_uart_config __initdata = {
 static int __init omap3_beagle_i2c_init(void)
 {
        omap_register_i2c_bus(1, 2600, NULL, 0);
+#ifdef CONFIG_I2C2_OMAP_BEAGLE
        omap_register_i2c_bus(2, 400, NULL, 0);
+#endif
        omap_register_i2c_bus(3, 400, NULL, 0);
        return 0;
 }

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 48438cc5d0caa282bcf8ae7050bdbebccea3e879..9204f711fd515655a32db1d0569b24bef08f1b00 100644 (file)
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -332,10 +332,27 @@ config I2C_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.
+         I2C interface on the Texas Instruments OMAP1/2/3 family of
+         processors.
+         Like OMAP1510/1610/1710/5912, OMAP242x, OMAP34x and OMAP35x.
          For details see http://www.ti.com/omap.
 
+config I2C2_OMAP_BEAGLE
+       bool "Enable I2C2 for OMAP3 BeagleBoard"
+       depends on ARCH_OMAP && MACH_OMAP3_BEAGLE
+       select OMAP_MUX
+       default n
+       help
+         Say Y here if you want to enable I2C bus 2 at OMAP3 based
+         BeagleBoard.
+         I2C2 at BeagleBoard is connected to expansion connector, i.e. unused
+         if nothing is connected to this connector. As internal OMAP3 pull up
+         resistors are not strong enough, enabled but unused I2C2 bus results
+         in error messages (e.g. I2C timeouts). Enable this only if you have
+         something connected to I2C2 at board's expansion connector and this
+         extension has additional pull up resistors for I2C2 bus.
+
+
 config I2C_PARPORT
        tristate "Parallel port adapter"
        depends on PARPORT