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

phy: usbphyc: move vdda1v1 and vdda1v8 in phy_init

Browse Source 
vdda1v1 and vdda1v8 are used by the PLL.
Both need to be enabled before starting the PLL.

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
This commit is contained in:
Patrick Delaunay 2019-03-29 15:42:12 +01:00 committed by Marek Vasut
parent c50151d43f
commit e1904abc1b
1 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
drivers/phy/phy-stm32-usbphyc.c
View File

@ -60,7 +60,8 @@ struct stm32_usbphyc {
} phys[MAX_PHYS]; } phys[MAX_PHYS];
}; };
void stm32_usbphyc_get_pll_params(u32 clk_rate, struct pll_params *pll_params) static void stm32_usbphyc_get_pll_params(u32 clk_rate,
struct pll_params *pll_params)
{ {
unsigned long long fvco, ndiv, frac; unsigned long long fvco, ndiv, frac;
@ -153,6 +154,18 @@ static int stm32_usbphyc_phy_init(struct phy *phy)
if (pllen && stm32_usbphyc_is_init(usbphyc)) if (pllen && stm32_usbphyc_is_init(usbphyc))
goto initialized; goto initialized;
if (usbphyc->vdda1v1) {
ret = regulator_set_enable(usbphyc->vdda1v1, true);
if (ret)
return ret;
}
if (usbphyc->vdda1v8) {
ret = regulator_set_enable(usbphyc->vdda1v8, true);
if (ret)
return ret;
}
if (pllen) { if (pllen) {
clrbits_le32(usbphyc->base + STM32_USBPHYC_PLL, PLLEN); clrbits_le32(usbphyc->base + STM32_USBPHYC_PLL, PLLEN);
udelay(PLL_PWR_DOWN_TIME_US); udelay(PLL_PWR_DOWN_TIME_US);
@ -183,6 +196,7 @@ static int stm32_usbphyc_phy_exit(struct phy *phy)
{ {
struct stm32_usbphyc *usbphyc = dev_get_priv(phy->dev); struct stm32_usbphyc *usbphyc = dev_get_priv(phy->dev);
struct stm32_usbphyc_phy *usbphyc_phy = usbphyc->phys + phy->id; struct stm32_usbphyc_phy *usbphyc_phy = usbphyc->phys + phy->id;
int ret;
pr_debug("%s phy ID = %lu\n", __func__, phy->id); pr_debug("%s phy ID = %lu\n", __func__, phy->id);
usbphyc_phy->init = false; usbphyc_phy->init = false;
@ -202,6 +216,18 @@ static int stm32_usbphyc_phy_exit(struct phy *phy)
if (readl(usbphyc->base + STM32_USBPHYC_PLL) & PLLEN) if (readl(usbphyc->base + STM32_USBPHYC_PLL) & PLLEN)
return -EIO; return -EIO;
if (usbphyc->vdda1v1) {
ret = regulator_set_enable(usbphyc->vdda1v1, false);
if (ret)
return ret;
}
if (usbphyc->vdda1v8) {
ret = regulator_set_enable(usbphyc->vdda1v8, false);
if (ret)
return ret;
}
return 0; return 0;
} }
@ -212,20 +238,8 @@ static int stm32_usbphyc_phy_power_on(struct phy *phy)
int ret; int ret;
pr_debug("%s phy ID = %lu\n", __func__, phy->id); pr_debug("%s phy ID = %lu\n", __func__, phy->id);
if (usbphyc->vdda1v1) { if (usbphyc_phy->vdd) {
ret = regulator_set_enable(usbphyc->vdda1v1, true); ret = regulator_set_enable(usbphyc_phy->vdd, true);
if (ret)
return ret;
}
if (usbphyc->vdda1v8) {
ret = regulator_set_enable(usbphyc->vdda1v8, true);
if (ret)
return ret;
}
if (usbphyc->vdd) {
ret = regulator_set_enable(usbphyc->vdd, true);
if (ret) if (ret)
return ret; return ret;
} }
@ -247,20 +261,8 @@ static int stm32_usbphyc_phy_power_off(struct phy *phy)
if (stm32_usbphyc_is_powered(usbphyc)) if (stm32_usbphyc_is_powered(usbphyc))
return 0; return 0;
if (usbphyc->vdda1v1) { if (usbphyc_phy->vdd) {
ret = regulator_set_enable(usbphyc->vdda1v1, false); ret = regulator_set_enable(usbphyc_phy->vdd, false);
if (ret)
return ret;
}
if (usbphyc->vdda1v8) {
ret = regulator_set_enable(usbphyc->vdda1v8, false);
if (ret)
return ret;
}
if (usbphyc->vdd) {
ret = regulator_set_enable(usbphyc->vdd, false);
if (ret) if (ret)
return ret; return ret;
} }