qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UPSTREAM: usb: ehci: Make the PHY handling generic 

Pull out the EHCI PHY functions into the ehci-hcd.c to let other
EHCI drivers use them.

Change-Id: I5b1cbaf7acb4cee6034e891ee7aecf0ca7d50728
Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
(cherry picked from commit b43cdf9b3fe246a8920d2b62ee41fc1722315ef0)
This commit is contained in:
Marek Vasut 2018-08-08 14:29:55 +02:00 committed by Frank Wang
parent 807262447f
commit f5439a16d8
3 changed files with 74 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
drivers/usb/host/ehci-generic.c
View File

@ -27,56 +27,6 @@ struct generic_ehci {
int reset_count;
};
static int ehci_setup_phy(struct udevice *dev, int index)
{
struct generic_ehci *priv = dev_get_priv(dev);
int ret;
ret = generic_phy_get_by_index(dev, index, &priv->phy);
if (ret) {
if (ret != -ENOENT) {
dev_err(dev, "failed to get usb phy\n");
return ret;
}
} else {
ret = generic_phy_init(&priv->phy);
if (ret) {
dev_err(dev, "failed to init usb phy\n");
return ret;
}
ret = generic_phy_power_on(&priv->phy);
if (ret) {
dev_err(dev, "failed to power on usb phy\n");
return generic_phy_exit(&priv->phy);
}
}
return 0;
}
static int ehci_shutdown_phy(struct udevice *dev)
{
struct generic_ehci *priv = dev_get_priv(dev);
int ret = 0;
if (generic_phy_valid(&priv->phy)) {
ret = generic_phy_power_off(&priv->phy);
if (ret) {
dev_err(dev, "failed to power off usb phy\n");
return ret;
}
ret = generic_phy_exit(&priv->phy);
if (ret) {
dev_err(dev, "failed to power off usb phy\n");
return ret;
}
}
return 0;
}
static int ehci_usb_probe(struct udevice *dev)
{
struct generic_ehci *priv = dev_get_priv(dev);
@ -146,7 +96,7 @@ static int ehci_usb_probe(struct udevice *dev)
}
}
err = ehci_setup_phy(dev, 0);
err = ehci_setup_phy(dev, &priv->phy, 0);
if (err)
goto reset_err;
@ -161,7 +111,7 @@ static int ehci_usb_probe(struct udevice *dev)
return 0;
phy_err:
ret = ehci_shutdown_phy(dev);
ret = ehci_shutdown_phy(dev, &priv->phy);
if (ret)
dev_err(dev, "failed to shutdown usb phy\n");
@ -186,7 +136,7 @@ static int ehci_usb_remove(struct udevice *dev)
if (ret)
return ret;
ret = ehci_shutdown_phy(dev);
ret = ehci_shutdown_phy(dev, &priv->phy);
if (ret)
return ret;

66
drivers/usb/host/ehci-hcd.c
View File

@ -1676,3 +1676,69 @@ struct dm_usb_ops ehci_usb_ops = {
};
#endif
#ifdef CONFIG_PHY
int ehci_setup_phy(struct udevice *dev, struct phy *phy, int index)
{
int ret;
if (!phy)
return 0;
ret = generic_phy_get_by_index(dev, index, phy);
if (ret) {
if (ret != -ENOENT) {
dev_err(dev, "failed to get usb phy\n");
return ret;
}
} else {
ret = generic_phy_init(phy);
if (ret) {
dev_err(dev, "failed to init usb phy\n");
return ret;
}
ret = generic_phy_power_on(phy);
if (ret) {
dev_err(dev, "failed to power on usb phy\n");
return generic_phy_exit(phy);
}
}
return 0;
}
int ehci_shutdown_phy(struct udevice *dev, struct phy *phy)
{
int ret = 0;
if (!phy)
return 0;
if (generic_phy_valid(phy)) {
ret = generic_phy_power_off(phy);
if (ret) {
dev_err(dev, "failed to power off usb phy\n");
return ret;
}
ret = generic_phy_exit(phy);
if (ret) {
dev_err(dev, "failed to power off usb phy\n");
return ret;
}
}
return 0;
}
#else
int ehci_setup_phy(struct udevice *dev, struct phy *phy, int index)
{
return 0;
}
int ehci_shutdown_phy(struct udevice *dev, struct phy *phy)
{
return 0;
}
#endif

5
drivers/usb/host/ehci.h
View File

@ -10,6 +10,7 @@
#define USB_EHCI_H
#include <usb.h>
#include <generic-phy.h>
/* Section 2.2.3 - N_PORTS */
#define MAX_HC_PORTS 15
@ -289,4 +290,8 @@ int ehci_register(struct udevice *dev, struct ehci_hccr *hccr,
int ehci_deregister(struct udevice *dev);
extern struct dm_usb_ops ehci_usb_ops;
/* EHCI PHY functions */
int ehci_setup_phy(struct udevice *dev, struct phy *phy, int index);
int ehci_shutdown_phy(struct udevice *dev, struct phy *phy);
#endif /* USB_EHCI_H */