sh: SE73180 updates for IRQ changes.

SE73180 can use the generic support, we just need to
wire up the IRQ demuxing.

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

diff --git a/arch/sh/boards/se/73180/setup.c b/arch/sh/boards/se/73180/setup.c
index cddc7a2b858fa425ecef3f83d3d1d902573c7a8f..4daf53b1457fe57e1afc07c671d1405d45bb6f13 100644 (file)
--- a/arch/sh/boards/se/73180/setup.c
+++ b/arch/sh/boards/se/73180/setup.c
@@ -12,6 +12,7 @@
 #include <linux/init.h>
 #include <asm/machvec.h>
 #include <asm/se73180.h>
+#include <asm/irq.h>
 
 void heartbeat_73180se(void);
 void init_73180se_IRQ(void);
@@ -50,6 +51,7 @@ struct sh_machine_vector mv_73180se __initmv = {
        .mv_outsl = sh73180se_outsl,
 
        .mv_init_irq = init_73180se_IRQ,
+       .mv_irq_demux = shmse_irq_demux,
 #ifdef CONFIG_HEARTBEAT
        .mv_heartbeat = heartbeat_73180se,
 #endif

diff --git a/arch/sh/configs/se73180_defconfig b/arch/sh/configs/se73180_defconfig
index d217e44c89a6a4caabc902d1502fe543b20bedfd..fe19feb95ca9a4a918761a23459d284db9c809c6 100644 (file)
--- a/arch/sh/configs/se73180_defconfig
+++ b/arch/sh/configs/se73180_defconfig
@@ -78,6 +78,7 @@ CONFIG_SH_73180_SOLUTION_ENGINE=y
 # CONFIG_SH_SECUREEDGE5410 is not set
 # CONFIG_SH_HS7751RVOIP is not set
 # CONFIG_SH_RTS7751R2D is not set
+# CONFIG_SH_R7780RP is not set
 # CONFIG_SH_EDOSK7705 is not set
 # CONFIG_SH_SH4202_MICRODEV is not set
 # CONFIG_SH_UNKNOWN is not set

diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig
index fb586b1cf8bb6b236d9b458110ef5a2740af3fb8..9064dfc91e6d7a76c951a00f1b66fbc8230516dd 100644 (file)
--- a/arch/sh/mm/Kconfig
+++ b/arch/sh/mm/Kconfig
@@ -20,7 +20,6 @@ config CPU_SH4
 config CPU_SH4A
        bool
        select CPU_SH4
-       select CPU_HAS_INTC2_IRQ
 
 config CPU_SUBTYPE_ST40
        bool
@@ -144,6 +143,7 @@ config CPU_SUBTYPE_SH7770
 config CPU_SUBTYPE_SH7780
        bool "Support SH7780 processor"
        select CPU_SH4A
+       select CPU_HAS_INTC2_IRQ
 
 endmenu