From: lhh <lhh@rock-chips.com>
Date: Fri, 22 Oct 2010 04:23:20 +0000 (+0800)
Subject: del rk29 gic and timer warning
X-Git-Tag: firefly_0821_release~11046
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b9ba021d0934e4517a3b95c401070674ebd5aa67;p=firefly-linux-kernel-4.4.55.git

del rk29 gic and timer warning
---

diff --git a/arch/arm/mach-rk29/board-rk29sdk.c b/arch/arm/mach-rk29/board-rk29sdk.c
index 26a360585888..231e1327e1a1 100644
--- a/arch/arm/mach-rk29/board-rk29sdk.c
+++ b/arch/arm/mach-rk29/board-rk29sdk.c
@@ -42,8 +42,8 @@ extern struct sys_timer rk29_timer;
 
 static void __init rk29_gic_init_irq(void)
 {
-	gic_dist_init(0, RK29_GICPERI_BASE, 32);
-	gic_cpu_init(0, RK29_GICCPU_BASE);
+	gic_dist_init(0, (void __iomem *)RK29_GICPERI_BASE, 32);
+	gic_cpu_init(0, (void __iomem *)RK29_GICCPU_BASE);
 }
 
 static void __init machine_rk29_init_irq(void)
@@ -53,7 +53,7 @@ static void __init machine_rk29_init_irq(void)
 	//rk29_gpio_irq_setup();
 }
 static void __init machine_rk29_board_init(void)
-{
+{ 
 	
 }
 
diff --git a/arch/arm/mach-rk29/timer.c b/arch/arm/mach-rk29/timer.c
index 70569978f816..4826186b82e4 100644
--- a/arch/arm/mach-rk29/timer.c
+++ b/arch/arm/mach-rk29/timer.c
@@ -55,7 +55,7 @@
 #define IRQ_NR_TIMER_CLKSRC		IRQ_TIMER1
 #define TIMER_CLKSRC_NAME		"timer1"
 
-static struct clk *timer_clk;
+//static struct clk *timer_clk;
 static volatile unsigned long timer_mult; /* timer count = cycle * timer_mult */
 
 void rk29_timer_update_mult(void)