sam3x: Correct pmc_xtal_enable to use startup time parameter.

libopencm3 · May 10, 2013 · c9cd2d9 · c9cd2d9
1 parent 060839e
commit c9cd2d9
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/lib/sam3x/pmc.c b/lib/sam3x/pmc.c
@@ -22,8 +22,9 @@
 void pmc_xtal_enable(bool en, u8 startup_time)
 {
 	if (en) {
-		CKGR_MOR |= CKGR_MOR_KEY |
-				CKGR_MOR_MOSCXTEN | CKGR_MOR_MOSCXTST_MASK;
+		CKGR_MOR = (CKGR_MOR & ~CKGR_MOR_MOSCXTST_MASK) |
+				CKGR_MOR_KEY | CKGR_MOR_MOSCXTEN |
+				(startup_time << 8);
 		while (!(PMC_SR & PMC_SR_MOSCXTS));
 	} else {
 		CKGR_MOR = CKGR_MOR_KEY | (CKGR_MOR & ~CKGR_MOR_MOSCXTEN);