diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-29 21:54:54 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-29 21:54:54 +0100 |
commit | b43d151e9679a06df896ac3db65a9dca80040fed (patch) | |
tree | ac0b71ef0a28f795700d85a8c8e23ba3fb6eef30 /arch/arm/mach-mxs/include/mach/devices-common.h | |
parent | ARM: 6826/1: Merge v6 and v7 DEBUG_LL DCC support (diff) | |
parent | Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable (diff) | |
download | linux-dev-b43d151e9679a06df896ac3db65a9dca80040fed.tar.xz linux-dev-b43d151e9679a06df896ac3db65a9dca80040fed.zip |
Merge branches 'fixes' and 'devel-stable' into for-linus
Diffstat (limited to 'arch/arm/mach-mxs/include/mach/devices-common.h')
-rw-r--r-- | arch/arm/mach-mxs/include/mach/devices-common.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/mach-mxs/include/mach/devices-common.h b/arch/arm/mach-mxs/include/mach/devices-common.h index 71f24484b044..c5137f14c364 100644 --- a/arch/arm/mach-mxs/include/mach/devices-common.h +++ b/arch/arm/mach-mxs/include/mach/devices-common.h @@ -73,6 +73,19 @@ struct mxs_i2c_data { }; struct platform_device * __init mxs_add_mxs_i2c(const struct mxs_i2c_data *data); +/* mmc */ +#include <mach/mmc.h> +struct mxs_mxs_mmc_data { + int id; + resource_size_t iobase; + resource_size_t dma; + resource_size_t irq_err; + resource_size_t irq_dma; +}; +struct platform_device *__init mxs_add_mxs_mmc( + const struct mxs_mxs_mmc_data *data, + const struct mxs_mmc_platform_data *pdata); + /* pwm */ struct platform_device *__init mxs_add_mxs_pwm( resource_size_t iobase, int id); |