From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sat, 15 Jan 2011 13:24:02 +0000 (+0000)
Subject: Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux... 
X-Git-Tag: v2.6.38-rc1~38^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bbba75606963c82febf7bd2761ea848ac5d1a1bb;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'for-rmk' of git://git./linux/kernel/git/kgene/linux-samsung into devel-stable
---

bbba75606963c82febf7bd2761ea848ac5d1a1bb
diff --cc arch/arm/mach-s5pv310/cpu.c
index 72ab289,72092db..0db0fb6
--- a/arch/arm/mach-s5pv310/cpu.c
+++ b/arch/arm/mach-s5pv310/cpu.c
@@@ -120,9 -132,20 +130,18 @@@ void __init s5pv310_init_irq(void
  {
  	int irq;
  
 -	gic_cpu_base_addr = S5P_VA_GIC_CPU;
 -	gic_dist_init(0, S5P_VA_GIC_DIST, IRQ_LOCALTIMER);
 -	gic_cpu_init(0, S5P_VA_GIC_CPU);
 +	gic_init(0, IRQ_LOCALTIMER, S5P_VA_GIC_DIST, S5P_VA_GIC_CPU);
  
  	for (irq = 0; irq < MAX_COMBINER_NR; irq++) {
+ 
+ 		/*
+ 		 * From SPI(0) to SPI(39) and SPI(51), SPI(53) are
+ 		 * connected to the interrupt combiner. These irqs
+ 		 * should be initialized to support cascade interrupt.
+ 		 */
+ 		if ((irq >= 40) && !(irq == 51) && !(irq == 53))
+ 			continue;
+ 
  		combiner_init(irq, (void __iomem *)S5P_VA_COMBINER(irq),
  				COMBINER_IRQ(irq, 0));
  		combiner_cascade_irq(irq, IRQ_SPI(irq));