Patchwork [U-Boot,v2,2/2] arm: a320: use new ftpmu010 API

login
register
mail settings
Submitter Po-Yu Chuang
Date Feb. 18, 2011, 5:35 a.m.
Message ID <1298007323-1745-1-git-send-email-ratbert.chuang@gmail.com>
Download mbox | patch
Permalink /patch/83535/
State Accepted
Commit 8dc667c9b826ddf660f55223e1b328fc912bceb5
Delegated to: Albert ARIBAUD
Headers show

Comments

Po-Yu Chuang - Feb. 18, 2011, 5:35 a.m.
From: Po-Yu Chuang <ratbert@faraday-tech.com>

ftpmu010 related code has been moved to drivers/power/.

Signed-off-by: Po-Yu Chuang <ratbert@faraday-tech.com>
---
v2:
remove unused local variable oscc
include/ftpmu010.h -> include/faraday/ftpmu010.h

 arch/arm/cpu/arm920t/a320/timer.c |   23 +++--------------------
 include/configs/a320evb.h         |    5 +++++
 2 files changed, 8 insertions(+), 20 deletions(-)
Albert ARIBAUD - March 3, 2011, 7:27 a.m.
Le 18/02/2011 06:35, Po-Yu Chuang a écrit :
> From: Po-Yu Chuang<ratbert@faraday-tech.com>
>
> ftpmu010 related code has been moved to drivers/power/.
>
> Signed-off-by: Po-Yu Chuang<ratbert@faraday-tech.com>
> ---
> v2:
> remove unused local variable oscc
> include/ftpmu010.h ->  include/faraday/ftpmu010.h

Applied to u-boot-arm/next, thanks!

Amicalement,

Patch

diff --git a/arch/arm/cpu/arm920t/a320/timer.c b/arch/arm/cpu/arm920t/a320/timer.c
index d2e316f..7785036 100644
--- a/arch/arm/cpu/arm920t/a320/timer.c
+++ b/arch/arm/cpu/arm920t/a320/timer.c
@@ -19,21 +19,19 @@ 
 
 #include <common.h>
 #include <asm/io.h>
-#include <asm/arch/ftpmu010.h>
 #include <asm/arch/fttmr010.h>
+#include <faraday/ftpmu010.h>
 
 static ulong timestamp;
 static ulong lastdec;
 
 static struct fttmr010 *tmr = (struct fttmr010 *)CONFIG_FTTMR010_BASE;
-static struct ftpmu010 *pmu = (struct ftpmu010 *)CONFIG_FTPMU010_BASE;
 
 #define TIMER_CLOCK	32768
 #define TIMER_LOAD_VAL	0xffffffff
 
 int timer_init(void)
 {
-	unsigned int oscc;
 	unsigned int cr;
 
 	debug("%s()\n", __func__);
@@ -41,23 +39,8 @@  int timer_init(void)
 	/* disable timers */
 	writel(0, &tmr->cr);
 
-	/*
-	 * use 32768Hz oscillator for RTC, WDT, TIMER
-	 */
-
-	/* enable the 32768Hz oscillator */
-	oscc = readl(&pmu->OSCC);
-	oscc &= ~(FTPMU010_OSCC_OSCL_OFF | FTPMU010_OSCC_OSCL_TRI);
-	writel(oscc, &pmu->OSCC);
-
-	/* wait until ready */
-	while (!(readl(&pmu->OSCC) & FTPMU010_OSCC_OSCL_STABLE))
-		;
-
-	/* select 32768Hz oscillator */
-	oscc = readl(&pmu->OSCC);
-	oscc |= FTPMU010_OSCC_OSCL_RTCLSEL;
-	writel(oscc, &pmu->OSCC);
+	/* use 32768Hz oscillator for RTC, WDT, TIMER */
+	ftpmu010_32768osc_enable();
 
 	/* setup timer */
 	writel(TIMER_LOAD_VAL, &tmr->timer3_load);
diff --git a/include/configs/a320evb.h b/include/configs/a320evb.h
index 27f137f..5373bcb 100644
--- a/include/configs/a320evb.h
+++ b/include/configs/a320evb.h
@@ -32,6 +32,11 @@ 
 #undef CONFIG_SKIP_LOWLEVEL_INIT
 
 /*-----------------------------------------------------------------------
+ * Power Management Unit
+ */
+#define CONFIG_FTPMU010_POWER
+
+/*-----------------------------------------------------------------------
  * Timer
  */
 #define CONFIG_SYS_HZ		1000	/* timer ticks per second */