aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1/board-h2.c
diff options
context:
space:
mode:
authorFelipe Balbi <felipe.lima@indt.org.br>2007-11-26 23:01:45 -0500
committerTony Lindgren <tony@atomide.com>2008-02-08 13:38:01 -0500
commit138ab9f8321f67c71984ca43222efa71b0a0a0a9 (patch)
tree57e8bcabfb647fd2ecad10d3641ef2041857ff09 /arch/arm/mach-omap1/board-h2.c
parent6e2d4107245cc0411959e91d7a1613e15097f117 (diff)
ARM: OMAP1: Make omap1 use MMC multislot structures
Make omap1 use new MMC multislot structures. The related MMC patches will be sent separately. Signed-off-by: Felipe Balbi <felipe.lima@indt.org.br> Signed-off-by: Anderson Briglia <anderson.briglia@indt.org.br> Signed-off-by: Carlos Eduardo Aguiar <carlos.aguiar@indt.org.br> Signed-off-by: David Cohen <david.cohen@indt.org.br> Signed-off-by: Eduardo Valentin <eduardo.valentin@indt.org.br> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1/board-h2.c')
-rw-r--r--arch/arm/mach-omap1/board-h2.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c
index 18899d74d4c0..ab6e68b00064 100644
--- a/arch/arm/mach-omap1/board-h2.c
+++ b/arch/arm/mach-omap1/board-h2.c
@@ -389,15 +389,14 @@ static struct omap_usb_config h2_usb_config __initdata = {
389}; 389};
390 390
391static struct omap_mmc_config h2_mmc_config __initdata = { 391static struct omap_mmc_config h2_mmc_config __initdata = {
392 .mmc [0] = { 392 .mmc[0] = {
393 .enabled = 1, 393 .enabled = 1,
394 .wire4 = 1, 394 .wire4 = 1,
395 .wp_pin = OMAP_MPUIO(3),
396 .power_pin = -1, /* tps65010 gpio3 */
397 .switch_pin = OMAP_MPUIO(1),
398 }, 395 },
399}; 396};
400 397
398extern struct omap_mmc_platform_data h2_mmc_data;
399
401static struct omap_uart_config h2_uart_config __initdata = { 400static struct omap_uart_config h2_uart_config __initdata = {
402 .enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)), 401 .enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)),
403}; 402};
@@ -459,6 +458,7 @@ static void __init h2_init(void)
459 omap_board_config = h2_config; 458 omap_board_config = h2_config;
460 omap_board_config_size = ARRAY_SIZE(h2_config); 459 omap_board_config_size = ARRAY_SIZE(h2_config);
461 omap_serial_init(); 460 omap_serial_init();
461 h2_mmc_init();
462 462
463 /* irq for tps65010 chip */ 463 /* irq for tps65010 chip */
464 omap_cfg_reg(W4_GPIO58); 464 omap_cfg_reg(W4_GPIO58);