Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-28 23:51:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

usb: ehci-mx6: Split ehci_mx6_common_init()

Browse source 
In order to pass component addresses around easily instead of passing
ad-hoc sequence numbers, it is necessary to split ehci_mx6_common_init().
Make it so and call the separate functions instead.

Since board_ehci_hcd_init() makes no sense in DM case, do not call it
in DM case.

Fixes: 4de51cc25b ("usb: ehci-mx6: Drop assignment of sequence number")
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: Peng Fan <peng.fan@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Ye Li <ye.li@nxp.com>
Cc: uboot-imx <uboot-imx@nxp.com>
This commit is contained in:
Marek Vasut 2021-03-31 21:40:24 +02:00
parent 4dcfa3bcbc
commit ef464e4c36
1 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
drivers/usb/host/ehci-mx6.c
View file

@ -283,6 +283,7 @@ static void usb_oc_config(int index)
#endif #endif
} }
#if !CONFIG_IS_ENABLED(DM_USB)
/** /**
* board_usb_phy_mode - override usb phy mode * board_usb_phy_mode - override usb phy mode
* @port: usb host/otg port * @port: usb host/otg port
@ -329,27 +330,6 @@ int __weak board_ehci_power(int port, int on)
return 0; return 0;
} }
int ehci_mx6_common_init(struct usb_ehci *ehci, int index)
{
int ret;
/* Do board specific initialization */
ret = board_ehci_hcd_init(index);
if (ret)
return ret;
usb_power_config(index);
usb_oc_config(index);
#if defined(CONFIG_MX6) || defined(CONFIG_MX7ULP)
usb_internal_phy_clock_gate(index, 1);
usb_phy_enable(index, ehci);
#endif
return 0;
}
#if !CONFIG_IS_ENABLED(DM_USB)
int ehci_hcd_init(int index, enum usb_init_type init, int ehci_hcd_init(int index, enum usb_init_type init,
struct ehci_hccr **hccr, struct ehci_hcor **hcor) struct ehci_hccr **hccr, struct ehci_hcor **hcor)
{ {
@ -377,9 +357,20 @@ int ehci_hcd_init(int index, enum usb_init_type init,
enable_usboh3_clk(1); enable_usboh3_clk(1);
mdelay(1); mdelay(1);
ret = ehci_mx6_common_init(ehci, index); /* Do board specific initialization */
if (ret) ret = board_ehci_hcd_init(index);
if (ret) {
enable_usboh3_clk(0);
return ret; return ret;
}
usb_power_config(index);
usb_oc_config(index);
#if defined(CONFIG_MX6) || defined(CONFIG_MX7ULP)
usb_internal_phy_clock_gate(index, 1);
usb_phy_enable(index, ehci);
#endif
type = board_usb_phy_mode(index); type = board_usb_phy_mode(index);
@ -427,14 +418,18 @@ static int mx6_init_after_reset(struct ehci_ctrl *dev)
struct ehci_mx6_priv_data *priv = dev->priv; struct ehci_mx6_priv_data *priv = dev->priv;
enum usb_init_type type = priv->init_type; enum usb_init_type type = priv->init_type;
struct usb_ehci *ehci = priv->ehci; struct usb_ehci *ehci = priv->ehci;
int ret;
ret = ehci_mx6_common_init(priv->ehci, priv->portnr); usb_power_config(priv->portnr);
if (ret) usb_oc_config(priv->portnr);
return ret;
#if defined(CONFIG_MX6) || defined(CONFIG_MX7ULP)
usb_internal_phy_clock_gate(priv->portnr, 1);
usb_phy_enable(priv->portnr, ehci);
#endif
#if CONFIG_IS_ENABLED(DM_REGULATOR) #if CONFIG_IS_ENABLED(DM_REGULATOR)
if (priv->vbus_supply) { if (priv->vbus_supply) {
int ret;
ret = regulator_set_enable(priv->vbus_supply, ret = regulator_set_enable(priv->vbus_supply,
(type == USB_INIT_DEVICE) ? (type == USB_INIT_DEVICE) ?
false : true); false : true);
@ -668,9 +663,14 @@ static int ehci_usb_probe(struct udevice *dev)
if (ret) if (ret)
debug("%s: No vbus supply\n", dev->name); debug("%s: No vbus supply\n", dev->name);
#endif #endif
ret = ehci_mx6_common_init(ehci, priv->portnr);
if (ret) usb_power_config(priv->portnr);
goto err_clk; usb_oc_config(priv->portnr);
#if defined(CONFIG_MX6) || defined(CONFIG_MX7ULP)
usb_internal_phy_clock_gate(priv->portnr, 1);
usb_phy_enable(priv->portnr, ehci);
#endif
#if CONFIG_IS_ENABLED(DM_REGULATOR) #if CONFIG_IS_ENABLED(DM_REGULATOR)
if (priv->vbus_supply) { if (priv->vbus_supply) {