m32r: Define symbols to unify platform-dependent ICU checks

On some m32r platforms, cascaded ICUs are used.
This patch is required to simplify ei_handler and consolidate platform-
dependent ICU check routines.

  platform       ICU/INT1  ICU/INT0  ICU/INT2
 --------------  --------  --------  --------
  m32104ut        o         -         -
  m32700ut        o         o         o
  opsput          o         o         o
  usrv            o         -         -
  (others)        -         -         -

Signed-off-by: Hitoshi Yamamoto <hitoshiy@linux-m32r.org>
Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>

diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig
index 8ccf3e47bff8a1a79254a7d9a430514d818322ef..bd5fe76401f18dea117b6042362fc70a759a4a6f 100644 (file)
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@@ -57,9 +57,13 @@ config PLAT_MAPPI
 
 config PLAT_USRV
        bool "uServer"
+       select PLAT_HAS_INT1ICU
 
 config PLAT_M32700UT
        bool "M32700UT"
+       select PLAT_HAS_INT0ICU
+       select PLAT_HAS_INT1ICU
+       select PLAT_HAS_INT2ICU
        help
          The M3T-M32700UT is an evaluation board based on uT-Engine
          specification.  This board has an M32700 (Chaos) evaluation chip.
@@ -68,6 +72,9 @@ config PLAT_M32700UT
 
 config PLAT_OPSPUT
        bool "OPSPUT"
+       select PLAT_HAS_INT0ICU
+       select PLAT_HAS_INT1ICU
+       select PLAT_HAS_INT2ICU
        help
          The OPSPUT is an evaluation board based on uT-Engine
          specification.  This board has a OPSP-REP chip.
@@ -89,6 +96,7 @@ config PLAT_MAPPI3
 
 config PLAT_M32104UT
        bool "M32104UT"
+       select PLAT_HAS_INT1ICU
        help
          The M3T-M32104UT is an reference board based on uT-Engine
          specification.  This board has a M32104 chip.
@@ -149,6 +157,18 @@ config ISA_DUAL_ISSUE
        depends on CHIP_M32700 || CHIP_OPSP
        default y
 
+config PLAT_HAS_INT0ICU
+       bool
+       default n
+
+config PLAT_HAS_INT1ICU
+       bool
+       default n
+
+config PLAT_HAS_INT2ICU
+       bool
+       default n
+
 config BUS_CLOCK
        int "Bus Clock [Hz] (integer)"
        default "70000000" if PLAT_MAPPI

diff --git a/include/asm-m32r/m32r.h b/include/asm-m32r/m32r.h
index decfc59907c7f62b929cbaa6668edde9e95a8d02..214b44b40757582a8d48f82b5aeadf35d8d545a2 100644 (file)
--- a/include/asm-m32r/m32r.h
+++ b/include/asm-m32r/m32r.h
@@ -22,12 +22,26 @@
 #include <asm/m32700ut/m32700ut_pld.h>
 #include <asm/m32700ut/m32700ut_lan.h>
 #include <asm/m32700ut/m32700ut_lcd.h>
+/* for ei_handler:linux/arch/m32r/kernel/entry.S */
+#define M32R_INT1ICU_ISTS      PLD_ICUISTS
+#define M32R_INT1ICU_IRQ_BASE  M32700UT_PLD_IRQ_BASE
+#define M32R_INT0ICU_ISTS      M32700UT_LAN_ICUISTS
+#define M32R_INT0ICU_IRQ_BASE  M32700UT_LAN_PLD_IRQ_BASE
+#define M32R_INT2ICU_ISTS      M32700UT_LCD_ICUISTS
+#define M32R_INT2ICU_IRQ_BASE  M32700UT_LCD_PLD_IRQ_BASE
 #endif  /* CONFIG_PLAT_M32700UT */
 
 #if defined(CONFIG_PLAT_OPSPUT)
 #include <asm/opsput/opsput_pld.h>
 #include <asm/opsput/opsput_lan.h>
 #include <asm/opsput/opsput_lcd.h>
+/* for ei_handler:linux/arch/m32r/kernel/entry.S */
+#define M32R_INT1ICU_ISTS      PLD_ICUISTS
+#define M32R_INT1ICU_IRQ_BASE  OPSPUT_PLD_IRQ_BASE
+#define M32R_INT0ICU_ISTS      OPSPUT_LAN_ICUISTS
+#define M32R_INT0ICU_IRQ_BASE  OPSPUT_LAN_PLD_IRQ_BASE
+#define M32R_INT2ICU_ISTS      OPSPUT_LCD_ICUISTS
+#define M32R_INT2ICU_IRQ_BASE  OPSPUT_LCD_PLD_IRQ_BASE
 #endif  /* CONFIG_PLAT_OPSPUT */
 
 #if defined(CONFIG_PLAT_MAPPI2)
@@ -40,10 +54,16 @@
 
 #if defined(CONFIG_PLAT_USRV)
 #include <asm/m32700ut/m32700ut_pld.h>
+/* for ei_handler:linux/arch/m32r/kernel/entry.S */
+#define M32R_INT1ICU_ISTS      PLD_ICUISTS
+#define M32R_INT1ICU_IRQ_BASE  M32700UT_PLD_IRQ_BASE
 #endif
 
 #if defined(CONFIG_PLAT_M32104UT)
 #include <asm/m32104ut/m32104ut_pld.h>
+/* for ei_handler:linux/arch/m32r/kernel/entry.S */
+#define M32R_INT1ICU_ISTS      PLD_ICUISTS
+#define M32R_INT1ICU_IRQ_BASE  M32104UT_PLD_IRQ_BASE
 #endif  /* CONFIG_PLAT_M32104 */
 
 /*