diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3logic.c')
-rw-r--r-- | arch/arm/mach-omap2/board-omap3logic.c | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-omap3logic.c b/arch/arm/mach-omap2/board-omap3logic.c index 9b3c141ff51b..c008bf8e1c36 100644 --- a/arch/arm/mach-omap2/board-omap3logic.c +++ b/arch/arm/mach-omap2/board-omap3logic.c | |||
@@ -4,8 +4,9 @@ | |||
4 | * Copyright (C) 2010 Li-Pro.Net | 4 | * Copyright (C) 2010 Li-Pro.Net |
5 | * Stephan Linz <linz@li-pro.net> | 5 | * Stephan Linz <linz@li-pro.net> |
6 | * | 6 | * |
7 | * Copyright (C) 2010 Logic Product Development, Inc. | 7 | * Copyright (C) 2010-2012 Logic Product Development, Inc. |
8 | * Peter Barada <peter.barada@logicpd.com> | 8 | * Peter Barada <peter.barada@logicpd.com> |
9 | * Ashwin BIhari <ashwin.bihari@logicpd.com> | ||
9 | * | 10 | * |
10 | * Modified from Beagle, EVM, and RX51 | 11 | * Modified from Beagle, EVM, and RX51 |
11 | * | 12 | * |
@@ -45,6 +46,7 @@ | |||
45 | #include <plat/gpmc-smsc911x.h> | 46 | #include <plat/gpmc-smsc911x.h> |
46 | #include <plat/gpmc.h> | 47 | #include <plat/gpmc.h> |
47 | #include <plat/sdrc.h> | 48 | #include <plat/sdrc.h> |
49 | #include <plat/usb.h> | ||
48 | 50 | ||
49 | #define OMAP3LOGIC_SMSC911X_CS 1 | 51 | #define OMAP3LOGIC_SMSC911X_CS 1 |
50 | 52 | ||
@@ -85,6 +87,11 @@ static struct twl4030_gpio_platform_data omap3logic_gpio_data = { | |||
85 | | BIT(13) | BIT(15) | BIT(16) | BIT(17), | 87 | | BIT(13) | BIT(15) | BIT(16) | BIT(17), |
86 | }; | 88 | }; |
87 | 89 | ||
90 | static struct twl4030_usb_data omap3logic_usb_data = { | ||
91 | .usb_mode = T2_USB_MODE_ULPI, | ||
92 | }; | ||
93 | |||
94 | |||
88 | static struct twl4030_platform_data omap3logic_twldata = { | 95 | static struct twl4030_platform_data omap3logic_twldata = { |
89 | .irq_base = TWL4030_IRQ_BASE, | 96 | .irq_base = TWL4030_IRQ_BASE, |
90 | .irq_end = TWL4030_IRQ_END, | 97 | .irq_end = TWL4030_IRQ_END, |
@@ -92,6 +99,7 @@ static struct twl4030_platform_data omap3logic_twldata = { | |||
92 | /* platform_data for children goes here */ | 99 | /* platform_data for children goes here */ |
93 | .gpio = &omap3logic_gpio_data, | 100 | .gpio = &omap3logic_gpio_data, |
94 | .vmmc1 = &omap3logic_vmmc1, | 101 | .vmmc1 = &omap3logic_vmmc1, |
102 | .usb = &omap3logic_usb_data, | ||
95 | }; | 103 | }; |
96 | 104 | ||
97 | static int __init omap3logic_i2c_init(void) | 105 | static int __init omap3logic_i2c_init(void) |
@@ -185,6 +193,20 @@ static inline void __init board_smsc911x_init(void) | |||
185 | 193 | ||
186 | #ifdef CONFIG_OMAP_MUX | 194 | #ifdef CONFIG_OMAP_MUX |
187 | static struct omap_board_mux board_mux[] __initdata = { | 195 | static struct omap_board_mux board_mux[] __initdata = { |
196 | /* mUSB */ | ||
197 | OMAP3_MUX(HSUSB0_CLK, OMAP_MUX_MODE0 | OMAP_PIN_INPUT), | ||
198 | OMAP3_MUX(HSUSB0_STP, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT), | ||
199 | OMAP3_MUX(HSUSB0_DIR, OMAP_MUX_MODE0 | OMAP_PIN_INPUT), | ||
200 | OMAP3_MUX(HSUSB0_NXT, OMAP_MUX_MODE0 | OMAP_PIN_INPUT), | ||
201 | OMAP3_MUX(HSUSB0_DATA0, OMAP_MUX_MODE0 | OMAP_PIN_INPUT), | ||
202 | OMAP3_MUX(HSUSB0_DATA1, OMAP_MUX_MODE0 | OMAP_PIN_INPUT), | ||
203 | OMAP3_MUX(HSUSB0_DATA2, OMAP_MUX_MODE0 | OMAP_PIN_INPUT), | ||
204 | OMAP3_MUX(HSUSB0_DATA3, OMAP_MUX_MODE0 | OMAP_PIN_INPUT), | ||
205 | OMAP3_MUX(HSUSB0_DATA4, OMAP_MUX_MODE0 | OMAP_PIN_INPUT), | ||
206 | OMAP3_MUX(HSUSB0_DATA5, OMAP_MUX_MODE0 | OMAP_PIN_INPUT), | ||
207 | OMAP3_MUX(HSUSB0_DATA6, OMAP_MUX_MODE0 | OMAP_PIN_INPUT), | ||
208 | OMAP3_MUX(HSUSB0_DATA7, OMAP_MUX_MODE0 | OMAP_PIN_INPUT), | ||
209 | |||
188 | { .reg_offset = OMAP_MUX_TERMINATOR }, | 210 | { .reg_offset = OMAP_MUX_TERMINATOR }, |
189 | }; | 211 | }; |
190 | #endif | 212 | #endif |
@@ -205,6 +227,8 @@ static void __init omap3logic_init(void) | |||
205 | board_mmc_init(); | 227 | board_mmc_init(); |
206 | board_smsc911x_init(); | 228 | board_smsc911x_init(); |
207 | 229 | ||
230 | usb_musb_init(NULL); | ||
231 | |||
208 | /* Ensure SDRC pins are mux'd for self-refresh */ | 232 | /* Ensure SDRC pins are mux'd for self-refresh */ |
209 | omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT); | 233 | omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT); |
210 | omap_mux_init_signal("sdrc_cke1", OMAP_PIN_OUTPUT); | 234 | omap_mux_init_signal("sdrc_cke1", OMAP_PIN_OUTPUT); |