smallsolar/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitlab.denx.de/u-boot/custodians/u-boot-sunxi

Browse Source 
- H6 emac support
- USB PHY H6 logic alignment
This commit is contained in:
Tom Rini
2020-06-03 11:52:13 -04:00
parent 49c8c91cc6 1e7d00ae26
commit f1a69b8c73
4 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/phy/allwinner/phy-sun4i-usb.c
View File

@@ -282,7 +282,8 @@ static int sun4i_usb_phy_init(struct phy *phy)
return ret;
}
if (data->cfg->type == sun8i_a83t_phy) {
if (data->cfg->type == sun8i_a83t_phy ||
data->cfg->type == sun50i_h6_phy) {
if (phy->id == 0) {
val = readl(data->base + data->cfg->phyctl_offset);
val |= PHY_CTL_VBUSVLDEXT;
@@ -324,7 +325,8 @@ static int sun4i_usb_phy_exit(struct phy *phy)
int ret;
if (phy->id == 0) {
if (data->cfg->type == sun8i_a83t_phy) {
if (data->cfg->type == sun8i_a83t_phy ||
data->cfg->type == sun50i_h6_phy) {
void __iomem *phyctl = data->base +
data->cfg->phyctl_offset;