aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mxs/include/mach/devices-common.h
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-03-28 18:52:44 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-03-28 18:52:44 +0100
commit5f183860d5007ec76ea36bfa6c36d66e37f0dbcf (patch)
treef3f593fa2d1e01c2a6a4d9da9786ad1e12dfc2a0 /arch/arm/mach-mxs/include/mach/devices-common.h
parent938c0ace3ffb8cc2073a6d2e68fa7a6ab7cb471e (diff)
parenta10aabd5e313ec6481569be20d120191692b4ca6 (diff)
downloadkernel_samsung_smdk4412-5f183860d5007ec76ea36bfa6c36d66e37f0dbcf.zip
kernel_samsung_smdk4412-5f183860d5007ec76ea36bfa6c36d66e37f0dbcf.tar.gz
kernel_samsung_smdk4412-5f183860d5007ec76ea36bfa6c36d66e37f0dbcf.tar.bz2
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/mach-mxs/include/mach/devices-common.h')
-rw-r--r--arch/arm/mach-mxs/include/mach/devices-common.h13
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 71f2448..c5137f1 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);