usb: phy: phy-mxs-usb: Check the return value from stmp_reset_block()
stmp_reset_block() may fail, so let's check its return value and propagate it in the case of error. Acked-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
This commit is contained in:
parent
24dc3538bc
commit
51e563e3c1
|
@ -41,11 +41,14 @@ struct mxs_phy {
|
||||||
|
|
||||||
#define to_mxs_phy(p) container_of((p), struct mxs_phy, phy)
|
#define to_mxs_phy(p) container_of((p), struct mxs_phy, phy)
|
||||||
|
|
||||||
static void mxs_phy_hw_init(struct mxs_phy *mxs_phy)
|
static int mxs_phy_hw_init(struct mxs_phy *mxs_phy)
|
||||||
{
|
{
|
||||||
|
int ret;
|
||||||
void __iomem *base = mxs_phy->phy.io_priv;
|
void __iomem *base = mxs_phy->phy.io_priv;
|
||||||
|
|
||||||
stmp_reset_block(base + HW_USBPHY_CTRL);
|
ret = stmp_reset_block(base + HW_USBPHY_CTRL);
|
||||||
|
if (ret)
|
||||||
|
return ret;
|
||||||
|
|
||||||
/* Power up the PHY */
|
/* Power up the PHY */
|
||||||
writel(0, base + HW_USBPHY_PWD);
|
writel(0, base + HW_USBPHY_PWD);
|
||||||
|
@ -54,6 +57,8 @@ static void mxs_phy_hw_init(struct mxs_phy *mxs_phy)
|
||||||
writel(BM_USBPHY_CTRL_ENUTMILEVEL2 |
|
writel(BM_USBPHY_CTRL_ENUTMILEVEL2 |
|
||||||
BM_USBPHY_CTRL_ENUTMILEVEL3,
|
BM_USBPHY_CTRL_ENUTMILEVEL3,
|
||||||
base + HW_USBPHY_CTRL_SET);
|
base + HW_USBPHY_CTRL_SET);
|
||||||
|
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int mxs_phy_init(struct usb_phy *phy)
|
static int mxs_phy_init(struct usb_phy *phy)
|
||||||
|
@ -61,9 +66,7 @@ static int mxs_phy_init(struct usb_phy *phy)
|
||||||
struct mxs_phy *mxs_phy = to_mxs_phy(phy);
|
struct mxs_phy *mxs_phy = to_mxs_phy(phy);
|
||||||
|
|
||||||
clk_prepare_enable(mxs_phy->clk);
|
clk_prepare_enable(mxs_phy->clk);
|
||||||
mxs_phy_hw_init(mxs_phy);
|
return mxs_phy_hw_init(mxs_phy);
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void mxs_phy_shutdown(struct usb_phy *phy)
|
static void mxs_phy_shutdown(struct usb_phy *phy)
|
||||||
|
|
Loading…
Reference in New Issue