diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-11-01 12:12:22 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-01 12:12:22 -0400 |
commit | c72dbae971400e466ad9ff16c920cd6d9d8c55a1 (patch) | |
tree | 7a0ebba8b14d889a8b42edfa1272be222b908a82 /arch/arm/plat-mxc/include/mach/devices-common.h | |
parent | 7e1efcf5d2039fb7a91e21df32f4175dbca4d61c (diff) | |
parent | b4cbb8a4e602ea77b0525d06eff89c6a6070dab3 (diff) |
Merge branch 'imx/devel' into next/dt
The board changes in the imx/devel branch conflict with other changes in
the device imx/dt branch.
Conflicts:
arch/arm/mach-mx5/board-mx53_loco.c
arch/arm/mach-mx5/board-mx53_smd.c
arch/arm/plat-mxc/include/mach/common.h
arch/arm/plat-mxc/include/mach/memory.h
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/devices-common.h')
-rw-r--r-- | arch/arm/plat-mxc/include/mach/devices-common.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/include/mach/devices-common.h b/arch/arm/plat-mxc/include/mach/devices-common.h index 524538aabc4b..117a381fe3d5 100644 --- a/arch/arm/plat-mxc/include/mach/devices-common.h +++ b/arch/arm/plat-mxc/include/mach/devices-common.h | |||
@@ -251,6 +251,14 @@ struct platform_device *__init imx_add_mxc_nand( | |||
251 | const struct imx_mxc_nand_data *data, | 251 | const struct imx_mxc_nand_data *data, |
252 | const struct mxc_nand_platform_data *pdata); | 252 | const struct mxc_nand_platform_data *pdata); |
253 | 253 | ||
254 | struct imx_pata_imx_data { | ||
255 | resource_size_t iobase; | ||
256 | resource_size_t iosize; | ||
257 | resource_size_t irq; | ||
258 | }; | ||
259 | struct platform_device *__init imx_add_pata_imx( | ||
260 | const struct imx_pata_imx_data *data); | ||
261 | |||
254 | struct imx_mxc_pwm_data { | 262 | struct imx_mxc_pwm_data { |
255 | int id; | 263 | int id; |
256 | resource_size_t iobase; | 264 | resource_size_t iobase; |
@@ -301,3 +309,13 @@ struct platform_device *__init imx_add_spi_imx( | |||
301 | struct platform_device *imx_add_imx_dma(void); | 309 | struct platform_device *imx_add_imx_dma(void); |
302 | struct platform_device *imx_add_imx_sdma(char *name, | 310 | struct platform_device *imx_add_imx_sdma(char *name, |
303 | resource_size_t iobase, int irq, struct sdma_platform_data *pdata); | 311 | resource_size_t iobase, int irq, struct sdma_platform_data *pdata); |
312 | |||
313 | #include <linux/ahci_platform.h> | ||
314 | struct imx_ahci_imx_data { | ||
315 | const char *devid; | ||
316 | resource_size_t iobase; | ||
317 | resource_size_t irq; | ||
318 | }; | ||
319 | struct platform_device *__init imx_add_ahci_imx( | ||
320 | const struct imx_ahci_imx_data *data, | ||
321 | const struct ahci_platform_data *pdata); | ||