From c9cd2d9ab1fe369991938021ce5e92e0357e6b86 Mon Sep 17 00:00:00 2001
From: Gareth McMullin <gareth@motrr.com>
Date: Thu, 2 May 2013 10:37:46 -0700
Subject: [PATCH] sam3x: Correct pmc_xtal_enable to use startup time parameter.

---
 lib/sam3x/pmc.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/sam3x/pmc.c b/lib/sam3x/pmc.c
index c37e325d..cd0ad245 100644
--- 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);