diff options
Diffstat (limited to 'arch/arm/mach-mx5/board-mx51_3ds.c')
-rw-r--r-- | arch/arm/mach-mx5/board-mx51_3ds.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-mx5/board-mx51_3ds.c b/arch/arm/mach-mx5/board-mx51_3ds.c index 79ce8dcf3cda..e42bd2eb034e 100644 --- a/arch/arm/mach-mx5/board-mx51_3ds.c +++ b/arch/arm/mach-mx5/board-mx51_3ds.c | |||
@@ -30,7 +30,7 @@ | |||
30 | #define EXPIO_PARENT_INT (MXC_INTERNAL_IRQS + GPIO_PORTA + 6) | 30 | #define EXPIO_PARENT_INT (MXC_INTERNAL_IRQS + GPIO_PORTA + 6) |
31 | #define MX51_3DS_ECSPI2_CS (GPIO_PORTC + 28) | 31 | #define MX51_3DS_ECSPI2_CS (GPIO_PORTC + 28) |
32 | 32 | ||
33 | static struct pad_desc mx51_3ds_pads[] = { | 33 | static iomux_v3_cfg_t mx51_3ds_pads[] = { |
34 | /* UART1 */ | 34 | /* UART1 */ |
35 | MX51_PAD_UART1_RXD__UART1_RXD, | 35 | MX51_PAD_UART1_RXD__UART1_RXD, |
36 | MX51_PAD_UART1_TXD__UART1_TXD, | 36 | MX51_PAD_UART1_TXD__UART1_TXD, |
@@ -50,7 +50,7 @@ static struct pad_desc mx51_3ds_pads[] = { | |||
50 | MX51_PAD_EIM_D27__UART3_RTS, | 50 | MX51_PAD_EIM_D27__UART3_RTS, |
51 | 51 | ||
52 | /* CPLD PARENT IRQ PIN */ | 52 | /* CPLD PARENT IRQ PIN */ |
53 | MX51_PAD_GPIO_1_6__GPIO_1_6, | 53 | MX51_PAD_GPIO1_6__GPIO1_6, |
54 | 54 | ||
55 | /* KPP */ | 55 | /* KPP */ |
56 | MX51_PAD_KEY_ROW0__KEY_ROW0, | 56 | MX51_PAD_KEY_ROW0__KEY_ROW0, |
@@ -68,7 +68,7 @@ static struct pad_desc mx51_3ds_pads[] = { | |||
68 | MX51_PAD_NANDF_RB2__ECSPI2_SCLK, | 68 | MX51_PAD_NANDF_RB2__ECSPI2_SCLK, |
69 | MX51_PAD_NANDF_RB3__ECSPI2_MISO, | 69 | MX51_PAD_NANDF_RB3__ECSPI2_MISO, |
70 | MX51_PAD_NANDF_D15__ECSPI2_MOSI, | 70 | MX51_PAD_NANDF_D15__ECSPI2_MOSI, |
71 | MX51_PAD_NANDF_D12__GPIO_3_28, | 71 | MX51_PAD_NANDF_D12__GPIO3_28, |
72 | }; | 72 | }; |
73 | 73 | ||
74 | /* Serial ports */ | 74 | /* Serial ports */ |
@@ -172,6 +172,7 @@ static void __init mxc_board_init(void) | |||
172 | printk(KERN_WARNING "Init of the debugboard failed, all " | 172 | printk(KERN_WARNING "Init of the debugboard failed, all " |
173 | "devices on the board are unusable.\n"); | 173 | "devices on the board are unusable.\n"); |
174 | 174 | ||
175 | imx51_add_sdhci_esdhc_imx(0, NULL); | ||
175 | mxc_init_keypad(); | 176 | mxc_init_keypad(); |
176 | } | 177 | } |
177 | 178 | ||
@@ -186,7 +187,7 @@ static struct sys_timer mxc_timer = { | |||
186 | 187 | ||
187 | MACHINE_START(MX51_3DS, "Freescale MX51 3-Stack Board") | 188 | MACHINE_START(MX51_3DS, "Freescale MX51 3-Stack Board") |
188 | /* Maintainer: Freescale Semiconductor, Inc. */ | 189 | /* Maintainer: Freescale Semiconductor, Inc. */ |
189 | .boot_params = PHYS_OFFSET + 0x100, | 190 | .boot_params = MX51_PHYS_OFFSET + 0x100, |
190 | .map_io = mx51_map_io, | 191 | .map_io = mx51_map_io, |
191 | .init_irq = mx51_init_irq, | 192 | .init_irq = mx51_init_irq, |
192 | .init_machine = mxc_board_init, | 193 | .init_machine = mxc_board_init, |