Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 63e135a75ff41cc9ee1ac4012c505d46544dc10e

Authored by Roger Quadros
Committed by Tony Lindgren
1 parent 0047c909fb
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: OMAP3: 3630SDP: Adapt to ehci-omap changes 

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

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

Showing 1 changed file with 15 additions and 6 deletions Side-by-side Diff

arch/arm/mach-omap2/board-3630sdp.c
Diff comments   View file @ 63e135a
... ... @@ -53,16 +53,23 @@
53 53 OMAP_WAKEUP_EN | OMAP_PIN_INPUT_PULLUP);
54 54 }
55 55  
  56 +static struct usbhs_phy_data phy_data[] __initdata = {
  57 + {
  58 + .port = 1,
  59 + .reset_gpio = 126,
  60 + .vcc_gpio = -EINVAL,
  61 + },
  62 + {
  63 + .port = 2,
  64 + .reset_gpio = 61,
  65 + .vcc_gpio = -EINVAL,
  66 + },
  67 +};
  68 +
56 69 static struct usbhs_omap_platform_data usbhs_bdata __initdata = {
57 70  
58 71 .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY,
59 72 .port_mode[1] = OMAP_EHCI_PORT_MODE_PHY,
60   - .port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED,
61   -
62   - .phy_reset = true,
63   - .reset_gpio_port[0] = 126,
64   - .reset_gpio_port[1] = 61,
65   - .reset_gpio_port[2] = -EINVAL
66 73 };
67 74  
68 75 #ifdef CONFIG_OMAP_MUX
... ... @@ -199,6 +206,8 @@
199 206 board_smc91x_init();
200 207 board_flash_init(sdp_flash_partitions, chip_sel_sdp, NAND_BUSWIDTH_16);
201 208 enable_board_wakeup_source();
  209 +
  210 + usbhs_init_phys(phy_data, ARRAY_SIZE(phy_data));
202 211 usbhs_init(&usbhs_bdata);
203 212 }
204 213