diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-12-16 13:05:06 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-12-16 13:05:06 -0500 |
commit | 36facadd9ea98f8415d0dbb63e0763b7ee9d3911 (patch) | |
tree | 99dea00b332ed852f2b0a4923b581dd723f03634 /arch/arm/mach-omap2/board-4430sdp.c | |
parent | 2faa83e2a519abea1055d156ce1b42b8fa57e87b (diff) | |
parent | 0b83ae960cd7d4a5ee02786ecf41ab45688999bf (diff) |
Merge branch 'usb-next' into musb-merge
* usb-next: (132 commits)
USB: uas: Use GFP_NOIO instead of GFP_KERNEL in I/O submission path
USB: uas: Ensure we only bind to a UAS interface
USB: uas: Rename sense pipe and sense urb to status pipe and status urb
USB: uas: Use kzalloc instead of kmalloc
USB: uas: Fix up the Sense IU
usb: musb: core: kill unneeded #include's
DA8xx: assign name to MUSB IRQ resource
usb: gadget: g_ncm added
usb: gadget: f_ncm.c added
usb: gadget: u_ether: prepare for NCM
usb: pch_udc: Fix setup transfers with data out
usb: pch_udc: Fix compile error, warnings and checkpatch warnings
usb: add ab8500 usb transceiver driver
USB: gadget: Implement runtime PM for MSM bus glue driver
USB: gadget: Implement runtime PM for ci13xxx gadget
USB: gadget: Add USB controller driver for MSM SoC
USB: gadget: Introduce ci13xxx_udc_driver struct
USB: gadget: Initialize ci13xxx gadget device's coherent DMA mask
USB: gadget: Fix "scheduling while atomic" bugs in ci13xxx_udc
USB: gadget: Separate out PCI bus code from ci13xxx_udc
...
Diffstat (limited to 'arch/arm/mach-omap2/board-4430sdp.c')
-rw-r--r-- | arch/arm/mach-omap2/board-4430sdp.c | 35 |
1 files changed, 29 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c index df5a425a49d1..5aef69521e36 100644 --- a/arch/arm/mach-omap2/board-4430sdp.c +++ b/arch/arm/mach-omap2/board-4430sdp.c | |||
@@ -42,6 +42,7 @@ | |||
42 | #define ETH_KS8851_IRQ 34 | 42 | #define ETH_KS8851_IRQ 34 |
43 | #define ETH_KS8851_POWER_ON 48 | 43 | #define ETH_KS8851_POWER_ON 48 |
44 | #define ETH_KS8851_QUART 138 | 44 | #define ETH_KS8851_QUART 138 |
45 | #define OMAP4SDP_MDM_PWR_EN_GPIO 157 | ||
45 | #define OMAP4_SFH7741_SENSOR_OUTPUT_GPIO 184 | 46 | #define OMAP4_SFH7741_SENSOR_OUTPUT_GPIO 184 |
46 | #define OMAP4_SFH7741_ENABLE_GPIO 188 | 47 | #define OMAP4_SFH7741_ENABLE_GPIO 188 |
47 | 48 | ||
@@ -225,12 +226,29 @@ static void __init omap_4430sdp_init_irq(void) | |||
225 | omap_gpio_init(); | 226 | omap_gpio_init(); |
226 | } | 227 | } |
227 | 228 | ||
229 | static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = { | ||
230 | .port_mode[0] = EHCI_HCD_OMAP_MODE_PHY, | ||
231 | .port_mode[1] = EHCI_HCD_OMAP_MODE_UNKNOWN, | ||
232 | .port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN, | ||
233 | .phy_reset = false, | ||
234 | .reset_gpio_port[0] = -EINVAL, | ||
235 | .reset_gpio_port[1] = -EINVAL, | ||
236 | .reset_gpio_port[2] = -EINVAL, | ||
237 | }; | ||
238 | |||
228 | static struct omap_musb_board_data musb_board_data = { | 239 | static struct omap_musb_board_data musb_board_data = { |
229 | .interface_type = MUSB_INTERFACE_UTMI, | 240 | .interface_type = MUSB_INTERFACE_UTMI, |
230 | .mode = MUSB_PERIPHERAL, | 241 | .mode = MUSB_OTG, |
231 | .power = 100, | 242 | .power = 100, |
232 | }; | 243 | }; |
233 | 244 | ||
245 | static struct twl4030_usb_data omap4_usbphy_data = { | ||
246 | .phy_init = omap4430_phy_init, | ||
247 | .phy_exit = omap4430_phy_exit, | ||
248 | .phy_power = omap4430_phy_power, | ||
249 | .phy_set_clock = omap4430_phy_set_clk, | ||
250 | }; | ||
251 | |||
234 | static struct omap2_hsmmc_info mmc[] = { | 252 | static struct omap2_hsmmc_info mmc[] = { |
235 | { | 253 | { |
236 | .mmc = 1, | 254 | .mmc = 1, |
@@ -450,6 +468,7 @@ static struct twl4030_platform_data sdp4430_twldata = { | |||
450 | .vaux1 = &sdp4430_vaux1, | 468 | .vaux1 = &sdp4430_vaux1, |
451 | .vaux2 = &sdp4430_vaux2, | 469 | .vaux2 = &sdp4430_vaux2, |
452 | .vaux3 = &sdp4430_vaux3, | 470 | .vaux3 = &sdp4430_vaux3, |
471 | .usb = &omap4_usbphy_data | ||
453 | }; | 472 | }; |
454 | 473 | ||
455 | static struct i2c_board_info __initdata sdp4430_i2c_boardinfo[] = { | 474 | static struct i2c_board_info __initdata sdp4430_i2c_boardinfo[] = { |
@@ -514,11 +533,15 @@ static void __init omap_4430sdp_init(void) | |||
514 | platform_add_devices(sdp4430_devices, ARRAY_SIZE(sdp4430_devices)); | 533 | platform_add_devices(sdp4430_devices, ARRAY_SIZE(sdp4430_devices)); |
515 | omap_serial_init(); | 534 | omap_serial_init(); |
516 | omap4_twl6030_hsmmc_init(mmc); | 535 | omap4_twl6030_hsmmc_init(mmc); |
517 | /* OMAP4 SDP uses internal transceiver so register nop transceiver */ | 536 | |
518 | usb_nop_xceiv_register(); | 537 | /* Power on the ULPI PHY */ |
519 | /* FIXME: allow multi-omap to boot until musb is updated for omap4 */ | 538 | if (gpio_is_valid(OMAP4SDP_MDM_PWR_EN_GPIO)) { |
520 | if (!cpu_is_omap44xx()) | 539 | /* FIXME: Assumes pad is already muxed for GPIO mode */ |
521 | usb_musb_init(&musb_board_data); | 540 | gpio_request(OMAP4SDP_MDM_PWR_EN_GPIO, "USBB1 PHY VMDM_3V3"); |
541 | gpio_direction_output(OMAP4SDP_MDM_PWR_EN_GPIO, 1); | ||
542 | } | ||
543 | usb_ehci_init(&ehci_pdata); | ||
544 | usb_musb_init(&musb_board_data); | ||
522 | 545 | ||
523 | status = omap_ethernet_init(); | 546 | status = omap_ethernet_init(); |
524 | if (status) { | 547 | if (status) { |