summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1/i2c.c
diff options
context:
space:
mode:
authorCory Maccarrone <darkstar6262@gmail.com>2009-12-12 01:16:34 +0100
committerTony Lindgren <tony@atomide.com>2009-12-12 01:16:34 +0100
commitbf92a40762fb10a394281941a46f529463c49ffc (patch)
treef1c9e124e77c3ccdaebb89c644f9d8275fe5759f /arch/arm/mach-omap1/i2c.c
parentomap1: Add omap7xx USB support (diff)
downloadlinux-bf92a40762fb10a394281941a46f529463c49ffc.tar.xz
linux-bf92a40762fb10a394281941a46f529463c49ffc.zip
omap1: I2C mux and clocks for omap7xx
This change adds MUX pin configuration and clocks for I2C support to OMAP 730 and 850-based devices. Signed-off-by: Cory Maccarrone <darkstar6262@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1/i2c.c')
-rw-r--r--arch/arm/mach-omap1/i2c.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/arm/mach-omap1/i2c.c b/arch/arm/mach-omap1/i2c.c
index bc9d12bc1c61..1bf4735e27a6 100644
--- a/arch/arm/mach-omap1/i2c.c
+++ b/arch/arm/mach-omap1/i2c.c
@@ -21,13 +21,19 @@
#include <plat/i2c.h>
#include <plat/mux.h>
+#include <plat/cpu.h>
int __init omap_register_i2c_bus(int bus_id, u32 clkrate,
struct i2c_board_info const *info,
unsigned len)
{
- omap_cfg_reg(I2C_SDA);
- omap_cfg_reg(I2C_SCL);
+ if (cpu_is_omap7xx()) {
+ omap_cfg_reg(I2C_7XX_SDA);
+ omap_cfg_reg(I2C_7XX_SCL);
+ } else {
+ omap_cfg_reg(I2C_SDA);
+ omap_cfg_reg(I2C_SCL);
+ }
return omap_plat_register_i2c_bus(bus_id, clkrate, info, len);
}