Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6: (29 commits)
  sh: Fixup SH-2 BUG() trap handling.
  sh: Use early_param() for earlyprintk parsing.
  sh: Fix .empty_zero_page alignment for PAGE_SIZE > 4096.
  sh: Fixup .data.page_aligned.
  sh: Hook up SH7722 scif ipr interrupts.
  sh: Fixup sh_bios() trap handling.
  sh: SH-MobileR SH7722 CPU support.
  sh: Fixup dma_cache_sync() callers.
  sh: Convert remaining remap_area_pages() users to ioremap_page_range().
  sh: Fixup kernel_execve() for syscall cleanups.
  sh: Fix get_wchan().
  sh: BUG() handling through trapa vector.
  rtc: rtc-sh: alarm support.
  rtc: rtc-sh: fix rtc for out-by-one for the month.
  sh: Kill off unused SE7619 I/O ops.
  serial: sh-sci: Shut up various sci_rxd_in() gcc4 warnings.
  sh: Split out atomic ops logically.
  sh: Fix Solution Engine 7619 build.
  sh: Trivial build fixes for SH-2 support.
  sh: IPR IRQ updates for SH7619/SH7206.
  ...

1 files changed, 12 insertions, 4 deletions

diff --git a/arch/sh/boards/se/7206/irq.c b/arch/sh/boards/se/7206/irq.c
index 3fb0c5f5b23a..27da88486f73 100644
--- a/arch/sh/boards/se/7206/irq.c
+++ b/arch/sh/boards/se/7206/irq.c
@@ -10,6 +10,7 @@
 #include <linux/irq.h>
 #include <linux/io.h>
 #include <linux/irq.h>
+#include <linux/interrupt.h>
 #include <asm/se7206.h>
 
 #define INTSTS0 0x31800000
@@ -18,6 +19,13 @@
 #define INTMSK1 0x31800006
 #define INTSEL  0x31800008
 
+#define IRQ0_IRQ 64
+#define IRQ1_IRQ 65
+#define IRQ3_IRQ 67
+
+#define INTC_IPR01 0xfffe0818
+#define INTC_ICR1  0xfffe0802
+
 static void disable_se7206_irq(unsigned int irq)
 {
         unsigned short val;
@@ -39,7 +47,7 @@ static void disable_se7206_irq(unsigned int irq)
         case IRQ1_IRQ:
                 msk0 |= 0x000f;
                 break;
-        case IRQ2_IRQ:
+        case IRQ3_IRQ:
                 msk0 |= 0x0f00;
                 msk1 |= 0x00ff;
                 break;
@@ -70,7 +78,7 @@ static void enable_se7206_irq(unsigned int irq)
         case IRQ1_IRQ:
                 msk0 &= ~0x000f;
                 break;
-        case IRQ2_IRQ:
+        case IRQ3_IRQ:
                 msk0 &= ~0x0f00;
                 msk1 &= ~0x00ff;
                 break;
@@ -96,7 +104,7 @@ static void eoi_se7206_irq(unsigned int irq)
         case IRQ1_IRQ:
                 sts0 &= ~0x000f;
                 break;
-        case IRQ2_IRQ:
+        case IRQ3_IRQ:
                 sts0 &= ~0x0f00;
                 sts1 &= ~0x00ff;
                 break;
@@ -106,7 +114,7 @@ static void eoi_se7206_irq(unsigned int irq)
 }
 
 static struct irq_chip se7206_irq_chip __read_mostly = {
-        .name           = "SE7206-FPGA-IRQ",
+        .name           = "SE7206-FPGA",
         .mask           = disable_se7206_irq,
         .unmask         = enable_se7206_irq,
         .mask_ack       = disable_se7206_irq,