diff options
| author | Koen Kooi <koen@dominion.thruhere.net> | 2012-08-08 00:57:35 +0000 |
|---|---|---|
| committer | Heiko Schocher <hs@denx.de> | 2012-09-06 06:01:09 +0200 |
| commit | a532278074f1d1fa7d46b144e0d4b824ae7d3335 (patch) | |
| tree | acd05ba11c5929d221c7d77cff36320402852c3d | |
| parent | a6f0c4faa4c65a7b7048b12c9d180d7e1aad1721 (diff) | |
| download | u-boot-imx-a532278074f1d1fa7d46b144e0d4b824ae7d3335.zip u-boot-imx-a532278074f1d1fa7d46b144e0d4b824ae7d3335.tar.gz u-boot-imx-a532278074f1d1fa7d46b144e0d4b824ae7d3335.tar.bz2 | |
omap4 i2c: add support for i2c bus 4
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
| -rw-r--r-- | arch/arm/include/asm/arch-omap4/cpu.h | 1 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-omap4/i2c.h | 2 | ||||
| -rw-r--r-- | drivers/i2c/omap24xx_i2c.c | 8 |
3 files changed, 10 insertions, 1 deletions
diff --git a/arch/arm/include/asm/arch-omap4/cpu.h b/arch/arm/include/asm/arch-omap4/cpu.h index a8c4c60..3a0bfbf 100644 --- a/arch/arm/include/asm/arch-omap4/cpu.h +++ b/arch/arm/include/asm/arch-omap4/cpu.h @@ -138,6 +138,7 @@ struct watchdog { #define I2C_BASE1 (OMAP44XX_L4_PER_BASE + 0x70000) #define I2C_BASE2 (OMAP44XX_L4_PER_BASE + 0x72000) #define I2C_BASE3 (OMAP44XX_L4_PER_BASE + 0x60000) +#define I2C_BASE4 (OMAP44XX_L4_PER_BASE + 0x350000) /* MUSB base */ #define MUSB_BASE (OMAP44XX_L4_CORE_BASE + 0xAB000) diff --git a/arch/arm/include/asm/arch-omap4/i2c.h b/arch/arm/include/asm/arch-omap4/i2c.h index a91b4c2..02ee2f8 100644 --- a/arch/arm/include/asm/arch-omap4/i2c.h +++ b/arch/arm/include/asm/arch-omap4/i2c.h @@ -23,7 +23,7 @@ #ifndef _OMAP4_I2C_H_ #define _OMAP4_I2C_H_ -#define I2C_BUS_MAX 3 +#define I2C_BUS_MAX 4 #define I2C_DEFAULT_BASE I2C_BASE1 struct i2c { diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c index 978507b..094305f 100644 --- a/drivers/i2c/omap24xx_i2c.c +++ b/drivers/i2c/omap24xx_i2c.c @@ -442,6 +442,14 @@ int i2c_set_bus_num(unsigned int bus) return -1; } +#if I2C_BUS_MAX == 4 + if (bus == 3) + i2c_base = (struct i2c *)I2C_BASE4; + else + if (bus == 2) + i2c_base = (struct i2c *)I2C_BASE3; + else +#endif #if I2C_BUS_MAX == 3 if (bus == 2) i2c_base = (struct i2c *)I2C_BASE3; |