I2C and TWL4030 suport on 34xx

TWL4030 core support for 3430

Signed-off-by: chandra shekhar <x0044955@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/configs/omap_3430sdp_defconfig b/arch/arm/configs/omap_3430sdp_defconfig
index 5f718f69717cef8d318a4e25322d7069d4f77f97..1fb87b5d38e8b3a7d91edae6439b7c797488dad7 100644 (file)
--- a/arch/arm/configs/omap_3430sdp_defconfig
+++ b/arch/arm/configs/omap_3430sdp_defconfig
@@ -605,6 +605,11 @@ CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_OMAP=y
+#
+# Miscellaneous I2C Chip support
+#
+CONFIG_TWL4030_CORE=y
+CONFIG_TWL4030_GPIO=y
 
 #
 # SPI support

diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig
index f6b492bcbc28a8ede3b2c70e3b9dbbf1393a308b..196ec64e0755872e1e1680a9812389081d321263 100644 (file)
--- a/drivers/i2c/chips/Kconfig
+++ b/drivers/i2c/chips/Kconfig
@@ -132,7 +132,7 @@ config GPIOEXPANDER_OMAP
 
 config TWL4030_CORE
        bool "TI's TWL4030 companion chip Core Driver Support"
-       depends on I2C=y && ARCH_OMAP24XX
+       depends on I2C=y && (ARCH_OMAP24XX || ARCH_OMAP34XX)
        help
          Say yes here if you have TWL4030 chip on your board
 

diff --git a/include/asm-arm/arch-omap/board-3430sdp.h b/include/asm-arm/arch-omap/board-3430sdp.h
index fbd41909a98119e50d745ac0bed3d6e624a71c21..fa919c05defdb87567e59e5a6c284b8c40fc2b1a 100644 (file)
--- a/include/asm-arm/arch-omap/board-3430sdp.h
+++ b/include/asm-arm/arch-omap/board-3430sdp.h
@@ -51,7 +51,7 @@
 #define NAND_BASE      0x0C000000  /* NAND flash */
 #define ONENAND_MAP    0x20000000  /* OneNand flash */
 
-#ifdef CONFIG_I2C_TWL4030_CORE
+#ifdef CONFIG_TWL4030_CORE
 
 #define TWL4030_IRQNUM INT_34XX_SYS_NIRQ
 
@@ -59,7 +59,7 @@
 #define        IH_TWL4030_BASE         IH_BOARD_BASE
 #define        IH_TWL4030_END          (IH_TWL4030_BASE+8)
 
-#ifdef CONFIG_I2C_TWL4030_GPIO
+#ifdef CONFIG_TWL4030_GPIO
 
 /* TWL4030 GPIO Interrupts */
 #define IH_TWL4030_GPIO_BASE   (IH_TWL4030_END)