Revert "Merge remote-tracking branch 'arm-soc/for-next' into linaro-3.0"

This reverts commit c7e0c8535d73f8c5bf760926a2bd71c9840cf2ef, reversing
changes made to dfee09c8acf18e84fe197bb5d821d1e4e02d020f.

John Stultz reports that Panda doesn't boot anymore and 'git bisect'
indicated the merge commit itself as the culprit. The resulting kernel
log is:

[    1.734802] OMAP DSS rev 4.0
[    1.740417] omap_hwmod: dss_core: _wait_target_disable failed
[    1.746429] omap_device: omapdss_dss.-1: new worst case deactivate latency 01
[    1.755035] omapdss DISPC error: can't get dss_clk
[    1.760101] omapdss_dispc: probe of omapdss_dispc failed with error -2
[    1.767333] omapdss HDMI error: can't get hdmi_clk
[    1.772399] omapdss_hdmi: probe of omapdss_hdmi failed with error -2
[    1.780273] ------------[ cut here ]------------
[    1.785125] WARNING: at drivers/video/omap2/dss/dispc.c:553dispc_runtime_ge)
[    1.793640] Modules linked in:
[    1.796905] ---[ end trace 6fcb132ac310d004 ]---
[    1.801757] Unable to handle kernel NULL pointer dereference at virtualaddr0
[...]

Revert it so a later version of the arm-soc merge result can be used
instead.

1 files changed, 2 insertions, 34 deletions

diff --git a/arch/arm/mach-pxa/irq.c b/arch/arm/mach-pxa/irq.c
index b09e848eb6c..32ed551bf9c 100644
--- a/arch/arm/mach-pxa/irq.c
+++ b/arch/arm/mach-pxa/irq.c
@@ -37,8 +37,6 @@
 #define IPR(i)			(((i) < 32) ? (0x01c + ((i) << 2)) :		\
 				((i) < 64) ? (0x0b0 + (((i) - 32) << 2)) :	\
 				      (0x144 + (((i) - 64) << 2)))
-#define ICHP_VAL_IRQ		(1 << 31)
-#define ICHP_IRQ(i)		(((i) >> 16) & 0x7fff)
 #define IPR_VALID		(1 << 31)
 #define IRQ_BIT(n)		(((n) - PXA_IRQ(0)) & 0x1f)
 
@@ -66,7 +64,7 @@ static inline void __iomem *irq_base(int i)
 	return (void __iomem *)io_p2v(phys_base[i]);
 }
 
-void pxa_mask_irq(struct irq_data *d)
+static void pxa_mask_irq(struct irq_data *d)
 {
 	void __iomem *base = irq_data_get_irq_chip_data(d);
 	uint32_t icmr = __raw_readl(base + ICMR);
@@ -75,7 +73,7 @@ void pxa_mask_irq(struct irq_data *d)
 	__raw_writel(icmr, base + ICMR);
 }
 
-void pxa_unmask_irq(struct irq_data *d)
+static void pxa_unmask_irq(struct irq_data *d)
 {
 	void __iomem *base = irq_data_get_irq_chip_data(d);
 	uint32_t icmr = __raw_readl(base + ICMR);
@@ -129,36 +127,6 @@ static struct irq_chip pxa_low_gpio_chip = {
 	.irq_set_type	= pxa_set_low_gpio_type,
 };
 
-asmlinkage void __exception_irq_entry icip_handle_irq(struct pt_regs *regs)
-{
-	uint32_t icip, icmr, mask;
-
-	do {
-		icip = __raw_readl(IRQ_BASE + ICIP);
-		icmr = __raw_readl(IRQ_BASE + ICMR);
-		mask = icip & icmr;
-
-		if (mask == 0)
-			break;
-
-		handle_IRQ(PXA_IRQ(fls(mask) - 1), regs);
-	} while (1);
-}
-
-asmlinkage void __exception_irq_entry ichp_handle_irq(struct pt_regs *regs)
-{
-	uint32_t ichp;
-
-	do {
-		__asm__ __volatile__("mrc p6, 0, %0, c5, c0, 0\n": "=r"(ichp));
-
-		if ((ichp & ICHP_VAL_IRQ) == 0)
-			break;
-
-		handle_IRQ(PXA_IRQ(ICHP_IRQ(ichp)), regs);
-	} while (1);
-}
-
 static void __init pxa_init_low_gpio_irq(set_wake_t fn)
 {
 	int irq;