X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Flpc%2Fao_timer_lpc.c;h=166e2f154aa135feab827b5bb3fde19a9ed14f31;hb=5a26df7db9453bf0596f729a23efb90e5e8a63c7;hp=51835baaa76310f94ec1381541db33e65987f210;hpb=27e9b93f3d35890a49575b2ead1983ce3c2fc213;p=fw%2Faltos

diff --git a/src/lpc/ao_timer_lpc.c b/src/lpc/ao_timer_lpc.c
index 51835baa..166e2f15 100644
--- a/src/lpc/ao_timer_lpc.c
+++ b/src/lpc/ao_timer_lpc.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -99,19 +100,34 @@ ao_clock_init(void)
 				 (1 << LPC_SCB_SYSAHBCLKCTRL_FLASHARRAY) |
 				 (1 << LPC_SCB_SYSAHBCLKCTRL_GPIO) |
 				 (1 << LPC_SCB_SYSAHBCLKCTRL_IOCON));
-				 
+
+	/* Enable the brown-out detection at the highest voltage to
+	 * make sure the flash part remains happy
+	 */
+
+	lpc_scb.pdruncfg &= ~(1 << LPC_SCB_PDRUNCFG_BOD_PD);
+	lpc_scb.bodctrl = ((LPC_SCB_BOD_BODRSTLEV_2_63 << LPC_SCB_BOD_BODRSTLEV) |
+			   (LPC_SCB_BOD_BODINTVAL_RESERVED << LPC_SCB_BOD_BODINTVAL) |
+			   (1 << LPC_SCB_BOD_BODRSTENA));
+
 	/* Turn the IRC clock back on */
 	lpc_scb.pdruncfg &= ~(1 << LPC_SCB_PDRUNCFG_IRC_PD);
 	ao_clock_delay();
-	
+
 	/* Switch to the IRC clock */
 	lpc_scb.mainclksel = LPC_SCB_MAINCLKSEL_SEL_IRC << LPC_SCB_MAINCLKSEL_SEL;
-	lpc_scb.mainclkuen = (1 << LPC_SCB_MAINCLKUEN_ENA);
 	lpc_scb.mainclkuen = (0 << LPC_SCB_MAINCLKUEN_ENA);
 	lpc_scb.mainclkuen = (1 << LPC_SCB_MAINCLKUEN_ENA);
 	while (!(lpc_scb.mainclkuen & (1 << LPC_SCB_MAINCLKUEN_ENA)))
 		;
-	
+
+	/* Switch USB to the main clock */
+	lpc_scb.usbclksel = (LPC_SCB_USBCLKSEL_SEL_MAIN_CLOCK << LPC_SCB_USBCLKSEL_SEL);
+	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)))
+		;
+
 	/* Find a PLL post divider ratio that gets the FCCO in range */
 	for (p = 0; p < 4; p++)
 		if (AO_LPC_CLKOUT << (1 + p) >= AO_LPC_FCCO_MIN)
@@ -148,12 +164,12 @@ ao_clock_init(void)
 	lpc_scb.syspllclkuen = (1 << LPC_SCB_SYSPLLCLKUEN_ENA);
 	while (!(lpc_scb.syspllclkuen & (1 << LPC_SCB_SYSPLLCLKUEN_ENA)))
 		;
-	
+
 	/* Turn on the PLL */
 	lpc_scb.pdruncfg &= ~(1 << LPC_SCB_PDRUNCFG_SYSPLL_PD);
 
 	/* Wait for it to lock */
-	
+
 	for (i = 0; i < 20000; i++)
 		if (lpc_scb.syspllstat & (1 << LPC_SCB_SYSPLLSTAT_LOCK))
 			break;
@@ -177,4 +193,22 @@ ao_clock_init(void)
 	lpc_scb.ssp1clkdiv = 0;
 	lpc_scb.usbclkdiv = 0;
 	lpc_scb.clkoutdiv = 0;
+
+	/* Switch USB PLL source to system osc so we can power down the IRC */
+	lpc_scb.usbpllclksel = (LPC_SCB_USBPLLCLKSEL_SEL_SYSOSC << LPC_SCB_USBPLLCLKSEL_SEL);
+	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)))
+		;
+
+	/* Power down everything we don't need */
+	lpc_scb.pdruncfg = ((1 << LPC_SCB_PDRUNCFG_IRCOUT_PD) |
+			    (1 << LPC_SCB_PDRUNCFG_IRC_PD) |
+			    (0 << LPC_SCB_PDRUNCFG_BOD_PD) |
+			    (1 << LPC_SCB_PDRUNCFG_ADC_PD) |
+			    (1 << LPC_SCB_PDRUNCFG_WDTOSC_PD) |
+			    (1 << LPC_SCB_PDRUNCFG_USBPLL_PD) |
+			    (1 << LPC_SCB_PDRUNCFG_USBPAD_PD) |
+			    (1 << 11) |
+			    (7 << 13));
 }