Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 4a2ee5da83fb26cd74edbfb1b67700caef148adb

Authored by Roger Quadros
Committed by Tony Lindgren
1 parent 63e135a75f
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

ARM: OMAP: AM3517crane: Adapt to ehci-omap changes 

Use usbhs_init_phys() to register the PHY's VCC and RESET
regulators and the NOP PHY device.

Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Showing 1 changed file with 10 additions and 14 deletions Side-by-side Diff

arch/arm/mach-omap2/board-am3517crane.c
Diff comments   View file @ 4a2ee5d
... ... @@ -47,15 +47,17 @@
47 47 };
48 48 #endif
49 49  
  50 +static struct usbhs_phy_data phy_data[] __initdata = {
  51 + {
  52 + .port = 1,
  53 + .reset_gpio = GPIO_USB_NRESET,
  54 + .vcc_gpio = GPIO_USB_POWER,
  55 + .vcc_polarity = 1,
  56 + },
  57 +};
  58 +
50 59 static struct usbhs_omap_platform_data usbhs_bdata __initdata = {
51 60 .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY,
52   - .port_mode[1] = OMAP_USBHS_PORT_MODE_UNUSED,
53   - .port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED,
54   -
55   - .phy_reset = true,
56   - .reset_gpio_port[0] = GPIO_USB_NRESET,
57   - .reset_gpio_port[1] = -EINVAL,
58   - .reset_gpio_port[2] = -EINVAL
59 61 };
60 62  
61 63 static struct mtd_partition crane_nand_partitions[] = {
... ... @@ -131,13 +133,7 @@
131 133 return;
132 134 }
133 135  
134   - ret = gpio_request_one(GPIO_USB_POWER, GPIOF_OUT_INIT_HIGH,
135   - "usb_ehci_enable");
136   - if (ret < 0) {
137   - pr_err("Can not request GPIO %d\n", GPIO_USB_POWER);
138   - return;
139   - }
140   -
  136 + usbhs_init_phys(phy_data, ARRAY_SIZE(phy_data));
141 137 usbhs_init(&usbhs_bdata);
142 138 am35xx_emac_init(AM35XX_DEFAULT_MDIO_FREQUENCY, 1);
143 139 }