aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-omap1/board-ams-delta.c17
-rw-r--r--arch/arm/plat-omap/include/plat/onenand.h1
2 files changed, 18 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c
index bd0495a9ac3b..22cc8c8df6cb 100644
--- a/arch/arm/mach-omap1/board-ams-delta.c
+++ b/arch/arm/mach-omap1/board-ams-delta.c
@@ -179,6 +179,22 @@ static struct omap_board_config_kernel ams_delta_config[] = {
179 { OMAP_TAG_LCD, &ams_delta_lcd_config }, 179 { OMAP_TAG_LCD, &ams_delta_lcd_config },
180}; 180};
181 181
182static struct resource ams_delta_nand_resources[] = {
183 [0] = {
184 .start = OMAP1_MPUIO_BASE,
185 .end = OMAP1_MPUIO_BASE +
186 OMAP_MPUIO_IO_CNTL + sizeof(u32) - 1,
187 .flags = IORESOURCE_MEM,
188 },
189};
190
191static struct platform_device ams_delta_nand_device = {
192 .name = "ams-delta-nand",
193 .id = -1,
194 .num_resources = ARRAY_SIZE(ams_delta_nand_resources),
195 .resource = ams_delta_nand_resources,
196};
197
182static struct resource ams_delta_kp_resources[] = { 198static struct resource ams_delta_kp_resources[] = {
183 [0] = { 199 [0] = {
184 .start = INT_KEYBOARD, 200 .start = INT_KEYBOARD,
@@ -265,6 +281,7 @@ static struct omap1_cam_platform_data ams_delta_camera_platform_data = {
265}; 281};
266 282
267static struct platform_device *ams_delta_devices[] __initdata = { 283static struct platform_device *ams_delta_devices[] __initdata = {
284 &ams_delta_nand_device,
268 &ams_delta_kp_device, 285 &ams_delta_kp_device,
269 &ams_delta_lcd_device, 286 &ams_delta_lcd_device,
270 &ams_delta_led_device, 287 &ams_delta_led_device,
diff --git a/arch/arm/plat-omap/include/plat/onenand.h b/arch/arm/plat-omap/include/plat/onenand.h
index 72f433d7d827..affe87e9ece7 100644
--- a/arch/arm/plat-omap/include/plat/onenand.h
+++ b/arch/arm/plat-omap/include/plat/onenand.h
@@ -23,6 +23,7 @@ struct omap_onenand_platform_data {
23 int (*onenand_setup)(void __iomem *, int freq); 23 int (*onenand_setup)(void __iomem *, int freq);
24 int dma_channel; 24 int dma_channel;
25 u8 flags; 25 u8 flags;
26 u8 regulator_can_sleep;
26}; 27};
27 28
28#define ONENAND_MAX_PARTITIONS 8 29#define ONENAND_MAX_PARTITIONS 8