Patchwork [U-Boot] DaVinci DM6467: Fix Build Error

login
register
mail settings
Submitter Sandeep Paulraj
Date Dec. 29, 2010, 7:31 p.m.
Message ID <1293651117-9039-1-git-send-email-s-paulraj@ti.com>
Download mbox | patch
Permalink /patch/76940/
State Accepted
Commit 5342a710c9f67e1adb4505423eccf64d1eca5eb8
Delegated to: Sandeep Paulraj
Headers show

Comments

Sandeep Paulraj - Dec. 29, 2010, 7:31 p.m.
From: Sandeep Paulraj <s-paulraj@ti.com>

This commit fixes build errors on the DM6467 port.


Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
---
 arch/arm/cpu/arm926ejs/davinci/cpu.c |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

Patch

diff --git a/arch/arm/cpu/arm926ejs/davinci/cpu.c b/arch/arm/cpu/arm926ejs/davinci/cpu.c
index fc3551c..340c5be 100644
--- a/arch/arm/cpu/arm926ejs/davinci/cpu.c
+++ b/arch/arm/cpu/arm926ejs/davinci/cpu.c
@@ -60,6 +60,12 @@ 
 #define DDR_PLLDIV	PLLC_PLLDIV1
 #endif
 
+#ifdef CONFIG_SOC_DM646X
+#define DSP_PLLDIV	PLLC_PLLDIV1
+#define ARM_PLLDIV	PLLC_PLLDIV2
+#define DDR_PLLDIV	PLLC_PLLDIV1
+#endif
+
 #ifdef CONFIG_SOC_DA8XX
 const dv_reg * const sysdiv[7] = {
 	&davinci_pllc_regs->plldiv1, &davinci_pllc_regs->plldiv2,
@@ -145,7 +151,11 @@  static inline unsigned pll_postdiv(volatile void *pllbase)
 static unsigned pll_sysclk_mhz(unsigned pll_addr, unsigned div)
 {
 	volatile void	*pllbase = (volatile void *) pll_addr;
+#ifdef CONFIG_SOC_DM646X
+	unsigned	base = CFG_REFCLK_FREQ / 1000;
+#else
 	unsigned	base = CONFIG_SYS_HZ_CLOCK / 1000;
+#endif
 
 	/* the PLL might be bypassed */
 	if (REG(pllbase + PLLC_PLLCTL) & BIT(0)) {
@@ -176,6 +186,12 @@  int print_cpuinfo(void)
 	return 0;
 }
 
+#ifdef DAVINCI_DM6467EVM
+unsigned int davinci_arm_clk_get()
+{
+	return pll_sysclk_mhz(DAVINCI_PLL_CNTRL0_BASE, ARM_PLLDIV) * 1000000;
+}
+#endif
 #endif
 
 /*