summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mxs/include
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-02-28 12:21:17 +0000
committerArnd Bergmann <arnd@arndb.de>2012-02-28 12:21:17 +0000
commitee80285e1b79e6a7a6855c8be65bddc61f4d69be (patch)
tree70816118e053fac5983c06c0416053140fc1e438 /arch/arm/mach-mxs/include
parentdae2efd750393565a90fa75eeab289dbeacc166e (diff)
parent60c15358f603ca21e791d2cc17029b620c625258 (diff)
Merge branch 'mxs/gpmi' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/drivers
* 'mxs/gpmi' of git://git.linaro.org/people/shawnguo/linux-2.6: ARM: mxs: add GPMI-NAND support for imx23/imx28
Diffstat (limited to 'arch/arm/mach-mxs/include')
-rw-r--r--arch/arm/mach-mxs/include/mach/devices-common.h10
1 files changed, 10 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 dc369c1239f..f2e383955d8 100644
--- a/arch/arm/mach-mxs/include/mach/devices-common.h
+++ b/arch/arm/mach-mxs/include/mach/devices-common.h
@@ -66,6 +66,16 @@ struct platform_device *__init mxs_add_flexcan(
const struct mxs_flexcan_data *data,
const struct flexcan_platform_data *pdata);
+/* gpmi-nand */
+#include <linux/mtd/gpmi-nand.h>
+struct mxs_gpmi_nand_data {
+ const char *devid;
+ const struct resource res[GPMI_NAND_RES_SIZE];
+};
+struct platform_device *__init
+mxs_add_gpmi_nand(const struct gpmi_nand_platform_data *pdata,
+ const struct mxs_gpmi_nand_data *data);
+
/* i2c */
struct mxs_mxs_i2c_data {
int id;