diff options
| author | Evan Wilson <evan@oliodevices.com> | 2015-03-11 03:12:18 -0700 |
|---|---|---|
| committer | Evan Wilson <evan@oliodevices.com> | 2015-03-11 03:12:18 -0700 |
| commit | 88d9d40dbd5a793825e4e4e7a6491e1c9432a8c4 (patch) | |
| tree | 6c8c9f5ef14f455651d1aacbc4f9b06750e1a2ac /arch/arm/mach-omap2/board-omap3h1.c | |
| parent | 73d640c2a92993ff3c7017b0f12c5e382a5f0511 (diff) | |
| parent | 340c7f3193aab665807ec956b3bbebbb90ffce7a (diff) | |
| download | olio-linux-3.10-88d9d40dbd5a793825e4e4e7a6491e1c9432a8c4.tar.xz olio-linux-3.10-88d9d40dbd5a793825e4e4e7a6491e1c9432a8c4.zip | |
Merge remote-tracking branch 'olio/android-3.10-bringup' into android-3.10-bringup
Change-Id: I17130e9e9aaac01a393b57a9287d7005efbd8e89
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3h1.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3h1.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/board-omap3h1.c b/arch/arm/mach-omap2/board-omap3h1.c index 416f2c3f6be..4eea89ca049 100644 --- a/arch/arm/mach-omap2/board-omap3h1.c +++ b/arch/arm/mach-omap2/board-omap3h1.c @@ -64,6 +64,7 @@ #define MPUIRQ_GPIO 31 #define ATMEL_MXT_GPIO 105 #define USB_IRQ 124 +#define USB_ON_ETK_D7 21 #ifdef CONFIG_MACH_OMAP3_H1_DVT #define LCD_RESET_GPIO 94 @@ -221,6 +222,11 @@ static struct platform_device nop_phy_device = { }; +/* static struct usbhs_omap_platform_data usbhs_bdata __initdata = { */ +/* .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY, */ +/* }; */ + + /* --------------------------------------------------------------------------- */ /* REGULATORS */ @@ -244,9 +250,6 @@ static struct platform_device omap3h1_vbat = { }, }; -static struct usbhs_omap_platform_data usbhs_bdata __initdata = { - .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY, -}; /* --------------------------------------------------------------------------- */ @@ -513,6 +516,8 @@ static int __init omap3_h1_i2c_init(void) gpio_request_one(MPUIRQ_GPIO, GPIOF_IN, "mpu6515 IRQ pin"); omap3h1_i2c1_board_info[1].irq = gpio_to_irq(MPUIRQ_GPIO); + gpio_request_one(USB_ON_ETK_D7, GPIOF_OUT_INIT_HIGH, "USB on"); + /* Register buses */ omap_register_i2c_bus(1, 400, omap3h1_i2c1_board_info, ARRAY_SIZE(omap3h1_i2c1_board_info)); @@ -615,7 +620,7 @@ static void __init omap3_h1_init(void) usb_bind_phy("musb-hdrc.0.auto", 0, "nop_usb_xceiv"); /* "tusb-usb-h1" */ usb_musb_init(&musb_board_data); - usbhs_init(&usbhs_bdata); + /* usbhs_init(&usbhs_bdata); */ /* We don't need this */ /* h1_opp_init(); */ } |