From: Paul Mundt <lethal@linux-sh.org>
Date: Wed, 13 Jun 2012 03:12:41 +0000 (+0900)
Subject: Merge branch 'sh/dynamic-irq-cleanup' into sh-latest
X-Git-Tag: v3.6-rc1~131^2~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d978006a54ddf73cdeb3c59d1862a17f4445751c;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Merge branch 'sh/dynamic-irq-cleanup' into sh-latest

Conflicts:
	drivers/sh/intc/dynamic.c

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---

d978006a54ddf73cdeb3c59d1862a17f4445751c
diff --cc arch/sh/boards/mach-se/7722/setup.c
index 8f7f055,2ec0111..e04e2bc
--- a/arch/sh/boards/mach-se/7722/setup.c
+++ b/arch/sh/boards/mach-se/7722/setup.c
@@@ -15,8 -16,8 +16,9 @@@
  #include <linux/ata_platform.h>
  #include <linux/input.h>
  #include <linux/input/sh_keysc.h>
+ #include <linux/irqdomain.h>
  #include <linux/smc91x.h>
 +#include <linux/sh_intc.h>
  #include <mach-se/mach/se7722.h>
  #include <mach-se/mach/mrshpc.h>
  #include <asm/machvec.h>
diff --cc arch/sh/include/mach-se/mach/se7722.h
index 201081e,5508dc4..637e7ac
--- a/arch/sh/include/mach-se/mach/se7722.h
+++ b/arch/sh/include/mach-se/mach/se7722.h
@@@ -78,15 -77,9 +78,9 @@@
  #define PORT_HIZCRC     0xA405015CUL
  
  /* IRQ */
 -#define IRQ0_IRQ        32
 -#define IRQ1_IRQ        33
 +#define IRQ0_IRQ        evt2irq(0x600)
 +#define IRQ1_IRQ        evt2irq(0x620)
  
- #define IRQ01_MODE      0xb1800000
- #define IRQ01_STS       0xb1800004
- #define IRQ01_MASK      0xb1800008
- 
- /* Bits in IRQ01_* registers */
- 
  #define SE7722_FPGA_IRQ_USB	0 /* IRQ0 */
  #define SE7722_FPGA_IRQ_SMC	1 /* IRQ0 */
  #define SE7722_FPGA_IRQ_MRSHPC0	2 /* IRQ1 */