diff options
| author | Tom Rini <trini@ti.com> | 2012-09-17 11:39:03 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-09-17 11:39:03 -0700 |
| commit | 037e9d33db9fc86c1e671d64077b2d1a19df7f24 (patch) | |
| tree | 3fac46460bf6c39eb9775bcc0e1970042666292d /arch/arm | |
| parent | cd40a66c197fd43f761fa398cf785ff1a86250de (diff) | |
| parent | fd8dca83ed4b9d960d3b9a0450da12bb32f512f8 (diff) | |
| download | u-boot-imx-037e9d33db9fc86c1e671d64077b2d1a19df7f24.zip u-boot-imx-037e9d33db9fc86c1e671d64077b2d1a19df7f24.tar.gz u-boot-imx-037e9d33db9fc86c1e671d64077b2d1a19df7f24.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-i2c
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/include/asm/arch-omap4/cpu.h | 1 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-omap4/i2c.h | 2 |
2 files changed, 2 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 { |