[PATCH 19/19] phy: lpc18xx-usb-otg: fix clock order in phy init

From: Kishon Vijay Abraham I
Date: Tue Aug 11 2015 - 11:57:58 EST

From: Joachim Eastwood <manabian@xxxxxxxxx>

Changing the frequency of the USB clock must be done before the
PLL is powered on (prepared). This matters when the USB clock
is not setup by either boot ROM or boot loader. Reorder the
function calls to adhere to the order noted in the user manual.

Signed-off-by: Joachim Eastwood <manabian@xxxxxxxxx>
Signed-off-by: Kishon Vijay Abraham I <kishon@xxxxxx>
drivers/phy/phy-lpc18xx-usb-otg.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/phy/phy-lpc18xx-usb-otg.c b/drivers/phy/phy-lpc18xx-usb-otg.c
index 3aa8e4d..3b7a71e 100644
--- a/drivers/phy/phy-lpc18xx-usb-otg.c
+++ b/drivers/phy/phy-lpc18xx-usb-otg.c
@@ -33,12 +33,12 @@ static int lpc18xx_usb_otg_phy_init(struct phy *phy)
struct lpc18xx_usb_otg_phy *lpc = phy_get_drvdata(phy);
int ret;

- ret = clk_prepare(lpc->clk);
+ /* The PHY must be clocked at 480 MHz */
+ ret = clk_set_rate(lpc->clk, 480000000);
if (ret)
return ret;

- /* The PHY must be clocked at 480 MHz */
- return clk_set_rate(lpc->clk, 480000000);
+ return clk_prepare(lpc->clk);

static int lpc18xx_usb_otg_phy_exit(struct phy *phy)

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/