diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-21 19:42:32 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-21 19:42:32 -0400 |
| commit | b5153163ed580e00c67bdfecb02b2e3843817b3e (patch) | |
| tree | b8c878601f07f5df8f694435857a5f3dcfd75482 /arch/arm/mach-imx/devices-imx1.h | |
| parent | a8cbf22559ceefdcdfac00701e8e6da7518b7e8e (diff) | |
| parent | 6451d7783ba5ff24eb1a544eaa6665b890f30466 (diff) | |
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (278 commits)
arm: remove machine_desc.io_pg_offst and .phys_io
arm: use addruart macro to establish debug mappings
arm: return both physical and virtual addresses from addruart
arm/debug: consolidate addruart macros for CONFIG_DEBUG_ICEDCC
ARM: make struct machine_desc definition coherent with its comment
eukrea_mbimxsd-baseboard: Pass the correct GPIO to gpio_free
cpuimx27: fix compile when ULPI is selected
mach-pcm037_eet: fix compile errors
Fixing ethernet driver compilation error for i.MX31 ADS board
cpuimx51: update board support
mx5: add cpuimx51sd module and its baseboard
iomux-mx51: fix GPIO_1_xx 's IOMUX configuration
imx-esdhc: update devices registration
mx51: add resources for SD/MMC on i.MX51
iomux-mx51: fix SD1 and SD2's iomux configuration
clock-mx51: rename CLOCK1 to CLOCK_CCGR for better readability
clock-mx51: factorize clk_set_parent and clk_get_rate
eukrea_mbimxsd: add support for DVI displays
cpuimx25 & cpuimx35: fix OTG port registration in host mode
i.MX31 and i.MX35 : fix errate TLSbo65953 and ENGcm09472
...
Diffstat (limited to 'arch/arm/mach-imx/devices-imx1.h')
| -rw-r--r-- | arch/arm/mach-imx/devices-imx1.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/arch/arm/mach-imx/devices-imx1.h b/arch/arm/mach-imx/devices-imx1.h index a8d94f078196..81979486218e 100644 --- a/arch/arm/mach-imx/devices-imx1.h +++ b/arch/arm/mach-imx/devices-imx1.h | |||
| @@ -9,10 +9,12 @@ | |||
| 9 | #include <mach/mx1.h> | 9 | #include <mach/mx1.h> |
| 10 | #include <mach/devices-common.h> | 10 | #include <mach/devices-common.h> |
| 11 | 11 | ||
| 12 | #define imx1_add_i2c_imx(pdata) \ | 12 | extern const struct imx_imx_i2c_data imx1_imx_i2c_data __initconst; |
| 13 | imx_add_imx_i2c(0, MX1_I2C_BASE_ADDR, SZ_4K, MX1_INT_I2C, pdata) | 13 | #define imx1_add_imx_i2c(pdata) \ |
| 14 | imx_add_imx_i2c(&imx1_imx_i2c_data, pdata) | ||
| 14 | 15 | ||
| 15 | #define imx1_add_imx_uart0(pdata) \ | 16 | extern const struct imx_imx_uart_3irq_data imx1_imx_uart_data[] __initconst; |
| 16 | imx_add_imx_uart_3irq(0, MX1_UART1_BASE_ADDR, 0xd0, MX1_INT_UART1RX, MX1_INT_UART1TX, MX1_INT_UART1RTS, pdata) | 17 | #define imx1_add_imx_uart(id, pdata) \ |
| 17 | #define imx1_add_imx_uart1(pdata) \ | 18 | imx_add_imx_uart_3irq(&imx1_imx_uart_data[id], pdata) |
| 18 | imx_add_imx_uart_3irq(0, MX1_UART2_BASE_ADDR, 0xd0, MX1_INT_UART2RX, MX1_INT_UART2TX, MX1_INT_UART2RTS, pdata) | 19 | #define imx1_add_imx_uart0(pdata) imx1_add_imx_uart(0, pdata) |
| 20 | #define imx1_add_imx_uart1(pdata) imx1_add_imx_uart(1, pdata) | ||