[U-Boot] [PATCH v2 2/2] a320evb: replace built-in ftpmu010 related code

[Macpaul Lin]

Replace built-in ftpmu010 related code in timer.c for shared driver support.

Signed-off-by: Macpaul Lin <macp...@andestech.com>
---
Change v2
  - Code cleanup

 arch/arm/cpu/arm920t/a320/timer.c |   22 ++--------------------
 include/configs/a320evb.h         |    5 +++++
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/arch/arm/cpu/arm920t/a320/timer.c 
b/arch/arm/cpu/arm920t/a320/timer.c
index d2e316f..106fd7f 100644
--- a/arch/arm/cpu/arm920t/a320/timer.c
+++ b/arch/arm/cpu/arm920t/a320/timer.c
@@ -19,21 +19,18 @@
 
 #include <common.h>
 #include <asm/io.h>
-#include <asm/arch/ftpmu010.h>
 #include <asm/arch/fttmr010.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 +38,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 f67cf06..f169e5e 100644
--- a/include/configs/a320evb.h
+++ b/include/configs/a320evb.h
@@ -41,6 +41,11 @@
  */
 #define CONFIG_RTC_FTRTC010
 
+/*
+ * PMU
+ */
+#define CONFIG_FTPMU010_POWER
+
 /*-----------------------------------------------------------------------
  * Serial console configuration
  */
-- 
1.7.3.2

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot