ARM: msm: Don't touch GIC registers outside of GIC code

[deliverable/linux.git] / arch / arm / mach-msm / board-msm8x60.c

diff --git a/arch/arm/mach-msm/board-msm8x60.c b/arch/arm/mach-msm/board-msm8x60.c
index e37a724cd1eb5c1e2703571deb84f0adfc3d28f9..9df5c8357495e40c469056e002ad3b43e15b3f16 100644 (file)
--- a/arch/arm/mach-msm/board-msm8x60.c
+++ b/arch/arm/mach-msm/board-msm8x60.c
@@ -67,9 +67,6 @@ static void __init msm8x60_init_irq(void)
                of_irq_init(msm_dt_gic_match);
 #endif
 
-       /* Edge trigger PPIs except AVS_SVICINT and AVS_SVICINTSWDONE */
-       writel(0xFFFFD7FF, MSM_QGIC_DIST_BASE + GIC_DIST_CONFIG + 4);
-
        /* RUMI does not adhere to GIC spec by enabling STIs by default.
         * Enable/clear is supposed to be RO for STIs, but is RW on RUMI.
         */
@@ -158,6 +155,7 @@ MACHINE_END
 DT_MACHINE_START(MSM_DT, "Qualcomm MSM (Flattened Device Tree)")
        .map_io = msm8x60_map_io,
        .init_irq = msm8x60_init_irq,
+       .handle_irq = gic_handle_irq,
        .init_machine = msm8x60_dt_init,
        .init_late = msm8x60_init_late,
        .timer = &msm_timer,