Merge branch 'genirq' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'genirq' of master.kernel.org:/home/rmk/linux-2.6-arm: (24 commits)
  [ARM] 3683/2:  ARM: Convert at91rm9200 to generic irq handling
  [ARM] 3682/2:  ARM: Convert ixp4xx to generic irq handling
  [ARM] 3702/1: ARM: Convert ixp23xx to generic irq handling
  [ARM] 3701/1: ARM: Convert plat-omap to generic irq handling
  [ARM] 3700/1: ARM: Convert lh7a40x to generic irq handling
  [ARM] 3699/1: ARM: Convert s3c2410 to generic irq handling
  [ARM] 3698/1: ARM: Convert sa1100 to generic irq handling
  [ARM] 3697/1: ARM: Convert shark to generic irq handling
  [ARM] 3696/1: ARM: Convert clps711x to generic irq handling
  [ARM] 3694/1: ARM: Convert ecard driver to generic irq handling
  [ARM] 3693/1: ARM: Convert omap1 to generic irq handling
  [ARM] 3691/1: ARM: Convert imx to generic irq handling
  [ARM] 3688/1: ARM: Convert clps7500 to generic irq handling
  [ARM] 3687/1: ARM: Convert integrator to generic irq handling
  [ARM] 3685/1: ARM: Convert pxa to generic irq handling
  [ARM] 3684/1: ARM: Convert l7200 to generic irq handling
  [ARM] 3681/1: ARM: Convert ixp2000 to generic irq handling
  [ARM] 3680/1: ARM: Convert footbridge to generic irq handling
  [ARM] 3695/1: ARM drivers/pcmcia: Fixup includes
  [ARM] 3689/1: ARM drivers/input/touchscreen: Fixup includes
  ...

Manual conflict resolved in kernel/irq/handle.c (butt-ugly ARM tickless
code).

5 files changed, 56 insertions, 119 deletions

diff --git a/include/asm-arm/dyntick.h b/include/asm-arm/dyntick.h
new file mode 100644
index 000000000000..19fab2d2b760
--- /dev/null
+++ b/include/asm-arm/dyntick.h
@@ -0,0 +1,6 @@
+#ifndef _ASMARM_DYNTICK_H
+#define _ASMARM_DYNTICK_H
+
+#include <asm/mach/time.h>
+
+#endif /* _ASMARM_DYNTICK_H */
diff --git a/include/asm-arm/hw_irq.h b/include/asm-arm/hw_irq.h
new file mode 100644
index 000000000000..f1a08a500604
--- /dev/null
+++ b/include/asm-arm/hw_irq.h
@@ -0,0 +1,9 @@
+/*
+ * Nothing to see here yet
+ */
+#ifndef _ARCH_ARM_HW_IRQ_H
+#define _ARCH_ARM_HW_IRQ_H
+
+#include <asm/mach/irq.h>
+
+#endif
diff --git a/include/asm-arm/irq.h b/include/asm-arm/irq.h
index 66e67e60bc56..283af50a16cb 100644
--- a/include/asm-arm/irq.h
+++ b/include/asm-arm/irq.h
@@ -21,18 +21,13 @@
 
 struct irqaction;
 
-extern void disable_irq_nosync(unsigned int);
-extern void disable_irq(unsigned int);
-extern void enable_irq(unsigned int);
-
 /*
- * These correspond with the SA_TRIGGER_* defines, and therefore the
- * IORESOURCE_IRQ_* defines.
+ * Migration helpers
  */
-#define __IRQT_RISEDGE  (1 << 0)
-#define __IRQT_FALEDGE  (1 << 1)
-#define __IRQT_HIGHLVL  (1 << 2)
-#define __IRQT_LOWLVL   (1 << 3)
+#define __IRQT_FALEDGE  IRQ_TYPE_EDGE_FALLING
+#define __IRQT_RISEDGE  IRQ_TYPE_EDGE_RISING
+#define __IRQT_LOWLVL   IRQ_TYPE_LEVEL_LOW
+#define __IRQT_HIGHLVL  IRQ_TYPE_LEVEL_HIGH
 
 #define IRQT_NOEDGE     (0)
 #define IRQT_RISING     (__IRQT_RISEDGE)
@@ -40,12 +35,7 @@ extern void enable_irq(unsigned int);
 #define IRQT_BOTHEDGE   (__IRQT_RISEDGE|__IRQT_FALEDGE)
 #define IRQT_LOW        (__IRQT_LOWLVL)
 #define IRQT_HIGH       (__IRQT_HIGHLVL)
-#define IRQT_PROBE      (1 << 4)
-
-int set_irq_type(unsigned int irq, unsigned int type);
-void disable_irq_wake(unsigned int irq);
-void enable_irq_wake(unsigned int irq);
-int setup_irq(unsigned int, struct irqaction *);
+#define IRQT_PROBE      IRQ_TYPE_PROBE
 
 extern void migrate_irqs(void);
 #endif
diff --git a/include/asm-arm/mach/irq.h b/include/asm-arm/mach/irq.h
index d4d420ecf3a8..131f33733d25 100644
--- a/include/asm-arm/mach/irq.h
+++ b/include/asm-arm/mach/irq.h
@@ -10,95 +10,9 @@
 #ifndef __ASM_ARM_MACH_IRQ_H
 #define __ASM_ARM_MACH_IRQ_H
 
-struct irqdesc;
-struct pt_regs;
-struct seq_file;
-
-typedef void (*irq_handler_t)(unsigned int, struct irqdesc *, struct pt_regs *);
-typedef void (*irq_control_t)(unsigned int);
-
-struct irqchip {
-        /*
-         * Acknowledge the IRQ.
-         * If this is a level-based IRQ, then it is expected to mask the IRQ
-         * as well.
-         */
-        void (*ack)(unsigned int);
-        /*
-         * Mask the IRQ in hardware.
-         */
-        void (*mask)(unsigned int);
-        /*
-         * Unmask the IRQ in hardware.
-         */
-        void (*unmask)(unsigned int);
-        /*
-         * Ask the hardware to re-trigger the IRQ.
-         * Note: This method _must_ _not_ call the interrupt handler.
-         * If you are unable to retrigger the interrupt, do not
-         * provide a function, or if you do, return non-zero.
-         */
-        int (*retrigger)(unsigned int);
-        /*
-         * Set the type of the IRQ.
-         */
-        int (*set_type)(unsigned int, unsigned int);
-        /*
-         * Set wakeup-enable on the selected IRQ
-         */
-        int (*set_wake)(unsigned int, unsigned int);
-
-#ifdef CONFIG_SMP
-        /*
-         * Route an interrupt to a CPU
-         */
-        void (*set_cpu)(struct irqdesc *desc, unsigned int irq, unsigned int cpu);
-#endif
-};
-
-struct irqdesc {
-        irq_handler_t   handle;
-        struct irqchip  *chip;
-        struct irqaction *action;
-        struct list_head pend;
-        void __iomem    *base;
-        void            *data;
-        unsigned int    disable_depth;
-
-        unsigned int    triggered: 1;           /* IRQ has occurred           */
-        unsigned int    running  : 1;           /* IRQ is running             */
-        unsigned int    pending  : 1;           /* IRQ is pending             */
-        unsigned int    probing  : 1;           /* IRQ in use for a probe     */
-        unsigned int    probe_ok : 1;           /* IRQ can be used for probe  */
-        unsigned int    valid    : 1;           /* IRQ claimable              */
-        unsigned int    noautoenable : 1;       /* don't automatically enable IRQ */
-        unsigned int    unused   :25;
-
-        unsigned int    irqs_unhandled;
-        struct proc_dir_entry *procdir;
-
-#ifdef CONFIG_SMP
-        cpumask_t       affinity;
-        unsigned int    cpu;
-#endif
-
-        /*
-         * IRQ lock detection
-         */
-        unsigned int    lck_cnt;
-        unsigned int    lck_pc;
-        unsigned int    lck_jif;
-};
-
-extern struct irqdesc irq_desc[];
+#include <linux/irq.h>
 
-/*
- * Helpful inline function for calling irq descriptor handlers.
- */
-static inline void desc_handle_irq(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs)
-{
-        desc->handle(irq, desc, regs);
-}
+struct seq_file;
 
 /*
  * This is internal.  Do not use it.
@@ -106,18 +20,22 @@ static inline void desc_handle_irq(unsigned int irq, struct irqdesc *desc, struc
 extern void (*init_arch_irq)(void);
 extern void init_FIQ(void);
 extern int show_fiq_list(struct seq_file *, void *);
-void __set_irq_handler(unsigned int irq, irq_handler_t, int);
 
 /*
- * External stuff.
+ * Function wrappers
+ */
+#define set_irq_chipdata(irq, d)        set_irq_chip_data(irq, d)
+#define get_irq_chipdata(irq)           get_irq_chip_data(irq)
+
+/*
+ * Obsolete inline function for calling irq descriptor handlers.
  */
-#define set_irq_handler(irq,handler)            __set_irq_handler(irq,handler,0)
-#define set_irq_chained_handler(irq,handler)    __set_irq_handler(irq,handler,1)
-#define set_irq_data(irq,d)                     do { irq_desc[irq].data = d; } while (0)
-#define set_irq_chipdata(irq,d)                 do { irq_desc[irq].base = d; } while (0)
-#define get_irq_chipdata(irq)                   (irq_desc[irq].base)
+static inline void desc_handle_irq(unsigned int irq, struct irq_desc *desc,
+                                   struct pt_regs *regs)
+{
+        desc->handle_irq(irq, desc, regs);
+}
 
-void set_irq_chip(unsigned int irq, struct irqchip *);
 void set_irq_flags(unsigned int irq, unsigned int flags);
 
 #define IRQF_VALID      (1 << 0)
@@ -125,12 +43,25 @@ void set_irq_flags(unsigned int irq, unsigned int flags);
 #define IRQF_NOAUTOEN   (1 << 2)
 
 /*
- * Built-in IRQ handlers.
+ * This is for easy migration, but should be changed in the source
  */
-void do_level_IRQ(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs);
-void do_edge_IRQ(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs);
-void do_simple_IRQ(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs);
-void do_bad_IRQ(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs);
-void dummy_mask_unmask_irq(unsigned int irq);
+#define do_level_IRQ    handle_level_irq
+#define do_edge_IRQ     handle_edge_irq
+#define do_simple_IRQ   handle_simple_irq
+#define irqdesc         irq_desc
+#define irqchip         irq_chip
+
+#define do_bad_IRQ(irq,desc,regs)                       \
+do {                                                    \
+        spin_lock(&desc->lock);                         \
+        handle_bad_irq(irq, desc, regs);                \
+        spin_unlock(&desc->lock);                       \
+} while(0)
+
+extern unsigned long irq_err_count;
+static inline void ack_bad_irq(int irq)
+{
+        irq_err_count++;
+}
 
 #endif
diff --git a/include/linux/irq.h b/include/linux/irq.h
index ae1e422f18e3..95d7aa7954d2 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -347,8 +347,9 @@ extern int noirqdebug_setup(char *str);
 /* Checks whether the interrupt can be requested by request_irq(): */
 extern int can_request_irq(unsigned int irq, unsigned long irqflags);
 
-/* Dummy irq-chip implementation: */
+/* Dummy irq-chip implementations: */
 extern struct irq_chip no_irq_chip;
+extern struct irq_chip dummy_irq_chip;
 
 extern void
 set_irq_chip_and_handler(unsigned int irq, struct irq_chip *chip,