X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Flpc%2Fao_usb_lpc.c;h=e574f1e23f6eb3b6d80afc5b05cca9fe9a6888b2;hp=aac0df04a8956f5b485dfcc9940ac4814fe571ef;hb=298e54856b5f8809b43f24407caa4a6be60822f3;hpb=b3ad488477def157e277e239e81f164b49725925

diff --git a/src/lpc/ao_usb_lpc.c b/src/lpc/ao_usb_lpc.c
index aac0df04..e574f1e2 100644
--- a/src/lpc/ao_usb_lpc.c
+++ b/src/lpc/ao_usb_lpc.c
@@ -834,8 +834,9 @@ ao_usb_disable(void)
 	/* Turn off USB clock */
 	lpc_scb.usbclkdiv = 0;
 
-	/* Disable USB PHY */
-	lpc_scb.pdruncfg |= (1 << LPC_SCB_PDRUNCFG_USBPAD_PD);
+	/* Disable USB PHY and PLL */
+	lpc_scb.pdruncfg |= ((1 << LPC_SCB_PDRUNCFG_USBPAD_PD) |
+			     (1 << LPC_SCB_PDRUNCFG_USBPLL_PD));
 
 	/* Disable USB registers and RAM */
 	lpc_scb.sysahbclkctrl &= ~((1 << LPC_SCB_SYSAHBCLKCTRL_USB) |
@@ -877,7 +878,6 @@ ao_usb_enable(void)
 	lpc_scb.pdruncfg &= ~(1 << LPC_SCB_PDRUNCFG_USBPLL_PD);
 
 	lpc_scb.usbpllclksel = (LPC_SCB_SYSPLLCLKSEL_SEL_SYSOSC << LPC_SCB_SYSPLLCLKSEL_SEL);
-	lpc_scb.usbpllclkuen = (1 << LPC_SCB_USBPLLCLKUEN_ENA);
 	lpc_scb.usbpllclkuen = (0 << LPC_SCB_USBPLLCLKUEN_ENA);
 	lpc_scb.usbpllclkuen = (1 << LPC_SCB_USBPLLCLKUEN_ENA);
 	while (!(lpc_scb.usbpllclkuen & (1 << LPC_SCB_USBPLLCLKUEN_ENA)))
@@ -887,6 +887,10 @@ ao_usb_enable(void)
 		;
 
 	lpc_scb.usbclksel = 0;
+	lpc_scb.usbclkuen = (0 << LPC_SCB_USBCLKUEN_ENA);
+	lpc_scb.usbclkuen = (1 << LPC_SCB_USBCLKUEN_ENA);
+	while (!(lpc_scb.usbclkuen & (1 << LPC_SCB_USBCLKUEN_ENA)))
+		;
 
 	/* Turn on USB clock, use 48MHz clock unchanged */
 	lpc_scb.usbclkdiv = 1;