From: 黄涛 <huangtao@rock-chips.com>
Date: Tue, 9 Jul 2013 03:35:28 +0000 (+0800)
Subject: rk30: replace RK30_GICD_BASE with GIC_DIST_BASE, RK30_GICC_BASE with GIC_CPU_BASE
X-Git-Tag: firefly_0821_release~6922
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f59786a58ddc7f8d1aa2a9ada0e374dcb502f65c;p=firefly-linux-kernel-4.4.55.git

rk30: replace RK30_GICD_BASE with GIC_DIST_BASE, RK30_GICC_BASE with GIC_CPU_BASE
---

diff --git a/arch/arm/mach-rk30/cpuidle.c b/arch/arm/mach-rk30/cpuidle.c
index 11f8b3e23bd0..44e611496073 100644
--- a/arch/arm/mach-rk30/cpuidle.c
+++ b/arch/arm/mach-rk30/cpuidle.c
@@ -18,7 +18,7 @@
 
 static bool rk30_gic_interrupt_pending(void)
 {
-	return (readl_relaxed(RK30_GICC_BASE + GIC_CPU_HIGHPRI) != 0x3FF);
+	return (readl_relaxed(GIC_CPU_BASE + GIC_CPU_HIGHPRI) != 0x3FF);
 }
 
 static void rk30_wfi_until_interrupt(void)
diff --git a/arch/arm/mach-rk30/platsmp.c b/arch/arm/mach-rk30/platsmp.c
index 5f0a2db30a59..f1edf874eace 100755
--- a/arch/arm/mach-rk30/platsmp.c
+++ b/arch/arm/mach-rk30/platsmp.c
@@ -42,14 +42,14 @@ static void gic_raise_softirq_non_secure(const struct cpumask *mask, unsigned in
 	dsb();
 
 	/* this always happens on GIC0 */
-	writel_relaxed(map << 16 | irq | 0x8000, RK30_GICD_BASE + GIC_DIST_SOFTINT);
+	writel_relaxed(map << 16 | irq | 0x8000, GIC_DIST_BASE + GIC_DIST_SOFTINT);
 }
 
 static void gic_secondary_init_non_secure(void)
 {
 #define GIC_DIST_SECURITY	0x080
-	writel_relaxed(0xffffffff, RK30_GICD_BASE + GIC_DIST_SECURITY);
-	writel_relaxed(0xf, RK30_GICC_BASE + GIC_CPU_CTRL);
+	writel_relaxed(0xffffffff, GIC_DIST_BASE + GIC_DIST_SECURITY);
+	writel_relaxed(0xf, GIC_CPU_BASE + GIC_CPU_CTRL);
 	dsb();
 }
 #endif