From: 黄涛 <huangtao@rock-chips.com>
Date: Mon, 10 Jan 2011 11:27:00 +0000 (+0800)
Subject: rk29: support oprofile
X-Git-Tag: firefly_0821_release~10817
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=88bfaf17eaf22e2fb693a75277fa451385014594;p=firefly-linux-kernel-4.4.55.git

rk29: support oprofile
---

diff --git a/arch/arm/common/gic.c b/arch/arm/common/gic.c
index 337741f734ac..458a9ea676fc 100755
--- a/arch/arm/common/gic.c
+++ b/arch/arm/common/gic.c
@@ -192,11 +192,16 @@ void __init gic_dist_init(unsigned int gic_nr, void __iomem *base,
 
 	writel(0, base + GIC_DIST_CTRL);
 
+#ifdef CONFIG_ARCH_RK29
+	/* rk29 read GIC_DIST_CTR is 2, why? */
+	max_irq = NR_AIC_IRQS;
+#else
 	/*
 	 * Find out how many interrupts are supported.
 	 */
 	max_irq = readl(base + GIC_DIST_CTR) & 0x1f;
 	max_irq = (max_irq + 1) * 32;
+#endif
 
 	/*
 	 * The GIC only supports up to 1020 interrupt sources.
diff --git a/arch/arm/oprofile/op_model_v7.c b/arch/arm/oprofile/op_model_v7.c
index f20295f14adb..50fa78fa227f 100644
--- a/arch/arm/oprofile/op_model_v7.c
+++ b/arch/arm/oprofile/op_model_v7.c
@@ -368,6 +368,9 @@ static void armv7_pmnc_dump_regs(void)
 
 
 static int irqs[] = {
+#ifdef CONFIG_ARCH_RK29
+	IRQ_A8IRQ3,
+#endif
 #ifdef CONFIG_ARCH_OMAP3
 	INT_34XX_BENCH_MPU_EMUL,
 #endif