mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-14 06:35:12 +00:00
ARM: OMAP: AM3517evm: Adapt to ehci-omap changes
Use usbhs_init_phys() to register the PHY's RESET regulators and the NOP PHY device. Signed-off-by: Roger Quadros <rogerq@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
parent
4a2ee5da83
commit
9413624c25
1 changed files with 10 additions and 7 deletions
|
@ -274,6 +274,14 @@ static __init void am3517_evm_mcbsp1_init(void)
|
||||||
omap_ctrl_writel(devconf0, OMAP2_CONTROL_DEVCONF0);
|
omap_ctrl_writel(devconf0, OMAP2_CONTROL_DEVCONF0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static struct usbhs_phy_data phy_data[] __initdata = {
|
||||||
|
{
|
||||||
|
.port = 1,
|
||||||
|
.reset_gpio = 57,
|
||||||
|
.vcc_gpio = -EINVAL,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
static struct usbhs_omap_platform_data usbhs_bdata __initdata = {
|
static struct usbhs_omap_platform_data usbhs_bdata __initdata = {
|
||||||
.port_mode[0] = OMAP_EHCI_PORT_MODE_PHY,
|
.port_mode[0] = OMAP_EHCI_PORT_MODE_PHY,
|
||||||
#if defined(CONFIG_PANEL_SHARP_LQ043T1DG01) || \
|
#if defined(CONFIG_PANEL_SHARP_LQ043T1DG01) || \
|
||||||
|
@ -282,12 +290,6 @@ static struct usbhs_omap_platform_data usbhs_bdata __initdata = {
|
||||||
#else
|
#else
|
||||||
.port_mode[1] = OMAP_EHCI_PORT_MODE_PHY,
|
.port_mode[1] = OMAP_EHCI_PORT_MODE_PHY,
|
||||||
#endif
|
#endif
|
||||||
.port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED,
|
|
||||||
|
|
||||||
.phy_reset = true,
|
|
||||||
.reset_gpio_port[0] = 57,
|
|
||||||
.reset_gpio_port[1] = -EINVAL,
|
|
||||||
.reset_gpio_port[2] = -EINVAL
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifdef CONFIG_OMAP_MUX
|
#ifdef CONFIG_OMAP_MUX
|
||||||
|
@ -349,7 +351,6 @@ static struct omap2_hsmmc_info mmc[] = {
|
||||||
{} /* Terminator */
|
{} /* Terminator */
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
static void __init am3517_evm_init(void)
|
static void __init am3517_evm_init(void)
|
||||||
{
|
{
|
||||||
omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
|
omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
|
||||||
|
@ -361,6 +362,8 @@ static void __init am3517_evm_init(void)
|
||||||
|
|
||||||
/* Configure GPIO for EHCI port */
|
/* Configure GPIO for EHCI port */
|
||||||
omap_mux_init_gpio(57, OMAP_PIN_OUTPUT);
|
omap_mux_init_gpio(57, OMAP_PIN_OUTPUT);
|
||||||
|
|
||||||
|
usbhs_init_phys(phy_data, ARRAY_SIZE(phy_data));
|
||||||
usbhs_init(&usbhs_bdata);
|
usbhs_init(&usbhs_bdata);
|
||||||
am3517_evm_hecc_init(&am3517_evm_hecc_pdata);
|
am3517_evm_hecc_init(&am3517_evm_hecc_pdata);
|
||||||
/* DSS */
|
/* DSS */
|
||||||
|
|
Loading…
Reference in a new issue