summaryrefslogtreecommitdiffstats
path: root/arch/arm/boards/freescale-mx28-evk
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-11-16 14:02:36 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2012-11-16 14:02:36 +0100
commit3ff1015d247f754a4c06c2fb66a01668fe810f17 (patch)
treef358965902d83cd073c00f2476250e917427d564 /arch/arm/boards/freescale-mx28-evk
parent9749c2f16f61048a66a98a95b6a1e88d4f491cf0 (diff)
parentdf1e09fb061384cb51405a55dcf454c7341f34b7 (diff)
downloadbarebox-3ff1015d247f754a4c06c2fb66a01668fe810f17.tar.gz
barebox-3ff1015d247f754a4c06c2fb66a01668fe810f17.tar.xz
Merge branch 'for-next/mxs'
Diffstat (limited to 'arch/arm/boards/freescale-mx28-evk')
-rw-r--r--arch/arm/boards/freescale-mx28-evk/mx28-evk.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/arch/arm/boards/freescale-mx28-evk/mx28-evk.c b/arch/arm/boards/freescale-mx28-evk/mx28-evk.c
index 5bcb24cf45..4311473e65 100644
--- a/arch/arm/boards/freescale-mx28-evk/mx28-evk.c
+++ b/arch/arm/boards/freescale-mx28-evk/mx28-evk.c
@@ -109,6 +109,23 @@ static const uint32_t mx28evk_pads[] = {
LCD_RESET_GPIO | VE_3_3V | GPIO_OUT | GPIO_VALUE(0),
/* backlight */
PWM2_GPIO | VE_3_3V | STRENGTH(S4MA) | SE | VE,
+
+ /* GPMI-NAND (blocks mmc1 for now) */
+ GPMI_D0 | VE_3_3V,
+ GPMI_D1 | VE_3_3V,
+ GPMI_D2 | VE_3_3V,
+ GPMI_D3 | VE_3_3V,
+ GPMI_D4 | VE_3_3V,
+ GPMI_D5 | VE_3_3V,
+ GPMI_D6 | VE_3_3V,
+ GPMI_D7 | VE_3_3V,
+ GPMI_READY0 | VE_3_3V, /* external PU */
+ GPMI_CE0N | VE_3_3V, /* external PU */
+ GPMI_RDN | VE_3_3V,
+ GPMI_WRN | VE_3_3V,
+ GPMI_ALE | VE_3_3V,
+ GPMI_CLE | VE_3_3V,
+ GPMI_RESETN, /* act as WP, external PU */
};
static struct mxs_mci_platform_data mci_pdata = {
@@ -239,6 +256,9 @@ static int mx28_evk_devices_init(void)
add_generic_device("imx28-fec", 0, NULL, IMX_FEC0_BASE, 0x4000,
IORESOURCE_MEM, &fec_info);
+ add_generic_device("mxs_nand", 0, NULL, MXS_GPMI_BASE, 0x2000,
+ IORESOURCE_MEM, NULL);
+
return 0;
}
device_initcall(mx28_evk_devices_init);