i2c: Merge omap i2c drivers from omap-historic

Merge omap i2c drivers from omap-historic

Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
index 11935f6..13721f2 100644 (file)
--- a/drivers/i2c/Kconfig
+++ b/drivers/i2c/Kconfig
@@ -6,6 +6,7 @@ menu "I2C support"
 
 config I2C
        tristate "I2C support"
+       default y if MACH_OMAP_H3 || MACH_OMAP_OSK
        ---help---
          I2C (pronounce: I-square-C) is a slow serial bus protocol used in
          many micro controller applications and developed by Philips.  SMBus,

diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile
index 290b540..90402df 100644 (file)
--- a/drivers/i2c/busses/Makefile
+++ b/drivers/i2c/busses/Makefile
@@ -48,6 +48,7 @@ obj-$(CONFIG_I2C_VIAPRO)      += i2c-viapro.o
 obj-$(CONFIG_I2C_VOODOO3)      += i2c-voodoo3.o
 obj-$(CONFIG_SCx200_ACB)       += scx200_acb.o
 obj-$(CONFIG_SCx200_I2C)       += scx200_i2c.o
+obj-$(CONFIG_I2C_OMAP)          += i2c-omap.o
 
 ifeq ($(CONFIG_I2C_DEBUG_BUS),y)
 EXTRA_CFLAGS += -DDEBUG

diff --cc drivers/i2c/busses/i2c-omap.c
Simple merge

diff --cc drivers/i2c/chips/Kconfig
Simple merge

diff --cc drivers/i2c/chips/Makefile
Simple merge

diff --cc drivers/i2c/chips/gpio_expander_omap.c
Simple merge

diff --cc drivers/i2c/chips/isp1301_omap.c
Simple merge

diff --cc drivers/i2c/chips/menelaus.c
Simple merge

diff --cc drivers/i2c/chips/tlv320aic23.c
Simple merge

diff --cc drivers/i2c/chips/twl4030_core.c
Simple merge

diff --cc include/asm-arm/arch-omap/twl4030.h
Simple merge

diff --cc include/asm-arm/hardware/tsc2101.h
Simple merge

diff --cc include/linux/i2c-id.h
Simple merge