diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-12-12 03:16:32 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-12-12 03:16:32 +0300 |
| commit | b63128e81214cc2db2995d690438055c26d213a5 (patch) | |
| tree | 9b319655d1456fd9f2b8a1a25b7b70047e6fb0ad /arch/arm/plat-omap/include/plat/common.h | |
| parent | 4b715efccf9547c0d7fe864277526fee3d9b6bba (diff) | |
| download | linux-b63128e81214cc2db2995d690438055c26d213a5.tar.xz | |
omap: Split i2c platform init for mach-omap1 and mach-omap2
Otherwise we cannot limit new mux code to mach-omap2.
The same signal names should eventually work for other
omaps under mach-omap2.
Note that these pins don't need to be OMAP_PIN_INPUT_PULLUP,
just OMAP_PIN_INPUT is enough.
Cc: Jarkko Nikula <jhnikula@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/plat-omap/include/plat/common.h')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/common.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/arch/arm/plat-omap/include/plat/common.h b/arch/arm/plat-omap/include/plat/common.h index 2f816fe3ae86..32c22272425d 100644 --- a/arch/arm/plat-omap/include/plat/common.h +++ b/arch/arm/plat-omap/include/plat/common.h @@ -27,7 +27,7 @@ #ifndef __ARCH_ARM_MACH_OMAP_COMMON_H #define __ARCH_ARM_MACH_OMAP_COMMON_H -#include <linux/i2c.h> +#include <plat/i2c.h> struct sys_timer; @@ -36,18 +36,6 @@ extern void __iomem *gic_cpu_base_addr; extern void omap_map_common_io(void); extern struct sys_timer omap_timer; -#if defined(CONFIG_I2C_OMAP) || defined(CONFIG_I2C_OMAP_MODULE) -extern int omap_register_i2c_bus(int bus_id, u32 clkrate, - struct i2c_board_info const *info, - unsigned len); -#else -static inline int omap_register_i2c_bus(int bus_id, u32 clkrate, - struct i2c_board_info const *info, - unsigned len) -{ - return 0; -} -#endif /* IO bases for various OMAP processors */ struct omap_globals { |