diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-02-01 16:16:12 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-02-01 16:16:12 +0100 |
| commit | 7ca411ecd2dc1c6bc47caad4b1e25a118bd7441b (patch) | |
| tree | 716f34c98b8e9a1535a9dc42605644d0793f5161 /arch/arm/mach-imx | |
| parent | dc6550ed3be2c47476ccaefdee2277b9360a8ed6 (diff) | |
| parent | 976b4be6021569e9808cf83ab7600231d1315307 (diff) | |
| download | barebox-7ca411ecd2dc1c6bc47caad4b1e25a118bd7441b.tar.gz barebox-7ca411ecd2dc1c6bc47caad4b1e25a118bd7441b.tar.xz | |
Merge branch 'next'
Diffstat (limited to 'arch/arm/mach-imx')
| -rw-r--r-- | arch/arm/mach-imx/include/mach/imx27-regs.h | 1 | ||||
| -rw-r--r-- | arch/arm/mach-imx/speed-imx27.c | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/include/mach/imx27-regs.h b/arch/arm/mach-imx/include/mach/imx27-regs.h index 33d67d6f50..6c31ccd914 100644 --- a/arch/arm/mach-imx/include/mach/imx27-regs.h +++ b/arch/arm/mach-imx/include/mach/imx27-regs.h @@ -16,6 +16,7 @@ #define IMX_UART2_BASE (0x0b000 + IMX_IO_BASE) #define IMX_UART3_BASE (0x0c000 + IMX_IO_BASE) #define IMX_UART4_BASE (0x0d000 + IMX_IO_BASE) +#define IMX_I2C1_BASE (0x12000 + IMX_IO_BASE) #define IMX_GPIO_BASE (0x15000 + IMX_IO_BASE) #define IMX_TIM4_BASE (0x19000 + IMX_IO_BASE) #define IMX_TIM5_BASE (0x1a000 + IMX_IO_BASE) diff --git a/arch/arm/mach-imx/speed-imx27.c b/arch/arm/mach-imx/speed-imx27.c index deaca1eb4d..cdcd4191fe 100644 --- a/arch/arm/mach-imx/speed-imx27.c +++ b/arch/arm/mach-imx/speed-imx27.c @@ -154,6 +154,11 @@ ulong imx_get_lcdclk(void) return imx_get_perclk3(); } +ulong imx_get_i2cclk(void) +{ + return imx_get_ipgclk(); +} + void imx_dump_clocks(void) { uint32_t cid = CID; |