diff options
author | Hirokazu Takata <takata@linux-m32r.org> | 2007-08-17 04:22:15 -0400 |
---|---|---|
committer | Hirokazu Takata <takata@linux-m32r.org> | 2007-09-02 22:30:18 -0400 |
commit | e070fb743d9d13d9757e633d1bdd1f9c20b2d792 (patch) | |
tree | 3fd150774101fefcabc1e31da59899839e2f9613 /include/asm-m32r | |
parent | ef64cf605daa9c36d950ba94cc115b0aed130dbc (diff) |
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>
Diffstat (limited to 'include/asm-m32r')
-rw-r--r-- | include/asm-m32r/m32r.h | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/include/asm-m32r/m32r.h b/include/asm-m32r/m32r.h index decfc59907c7..214b44b40757 100644 --- a/include/asm-m32r/m32r.h +++ b/include/asm-m32r/m32r.h | |||
@@ -22,12 +22,26 @@ | |||
22 | #include <asm/m32700ut/m32700ut_pld.h> | 22 | #include <asm/m32700ut/m32700ut_pld.h> |
23 | #include <asm/m32700ut/m32700ut_lan.h> | 23 | #include <asm/m32700ut/m32700ut_lan.h> |
24 | #include <asm/m32700ut/m32700ut_lcd.h> | 24 | #include <asm/m32700ut/m32700ut_lcd.h> |
25 | /* for ei_handler:linux/arch/m32r/kernel/entry.S */ | ||
26 | #define M32R_INT1ICU_ISTS PLD_ICUISTS | ||
27 | #define M32R_INT1ICU_IRQ_BASE M32700UT_PLD_IRQ_BASE | ||
28 | #define M32R_INT0ICU_ISTS M32700UT_LAN_ICUISTS | ||
29 | #define M32R_INT0ICU_IRQ_BASE M32700UT_LAN_PLD_IRQ_BASE | ||
30 | #define M32R_INT2ICU_ISTS M32700UT_LCD_ICUISTS | ||
31 | #define M32R_INT2ICU_IRQ_BASE M32700UT_LCD_PLD_IRQ_BASE | ||
25 | #endif /* CONFIG_PLAT_M32700UT */ | 32 | #endif /* CONFIG_PLAT_M32700UT */ |
26 | 33 | ||
27 | #if defined(CONFIG_PLAT_OPSPUT) | 34 | #if defined(CONFIG_PLAT_OPSPUT) |
28 | #include <asm/opsput/opsput_pld.h> | 35 | #include <asm/opsput/opsput_pld.h> |
29 | #include <asm/opsput/opsput_lan.h> | 36 | #include <asm/opsput/opsput_lan.h> |
30 | #include <asm/opsput/opsput_lcd.h> | 37 | #include <asm/opsput/opsput_lcd.h> |
38 | /* for ei_handler:linux/arch/m32r/kernel/entry.S */ | ||
39 | #define M32R_INT1ICU_ISTS PLD_ICUISTS | ||
40 | #define M32R_INT1ICU_IRQ_BASE OPSPUT_PLD_IRQ_BASE | ||
41 | #define M32R_INT0ICU_ISTS OPSPUT_LAN_ICUISTS | ||
42 | #define M32R_INT0ICU_IRQ_BASE OPSPUT_LAN_PLD_IRQ_BASE | ||
43 | #define M32R_INT2ICU_ISTS OPSPUT_LCD_ICUISTS | ||
44 | #define M32R_INT2ICU_IRQ_BASE OPSPUT_LCD_PLD_IRQ_BASE | ||
31 | #endif /* CONFIG_PLAT_OPSPUT */ | 45 | #endif /* CONFIG_PLAT_OPSPUT */ |
32 | 46 | ||
33 | #if defined(CONFIG_PLAT_MAPPI2) | 47 | #if defined(CONFIG_PLAT_MAPPI2) |
@@ -40,10 +54,16 @@ | |||
40 | 54 | ||
41 | #if defined(CONFIG_PLAT_USRV) | 55 | #if defined(CONFIG_PLAT_USRV) |
42 | #include <asm/m32700ut/m32700ut_pld.h> | 56 | #include <asm/m32700ut/m32700ut_pld.h> |
57 | /* for ei_handler:linux/arch/m32r/kernel/entry.S */ | ||
58 | #define M32R_INT1ICU_ISTS PLD_ICUISTS | ||
59 | #define M32R_INT1ICU_IRQ_BASE M32700UT_PLD_IRQ_BASE | ||
43 | #endif | 60 | #endif |
44 | 61 | ||
45 | #if defined(CONFIG_PLAT_M32104UT) | 62 | #if defined(CONFIG_PLAT_M32104UT) |
46 | #include <asm/m32104ut/m32104ut_pld.h> | 63 | #include <asm/m32104ut/m32104ut_pld.h> |
64 | /* for ei_handler:linux/arch/m32r/kernel/entry.S */ | ||
65 | #define M32R_INT1ICU_ISTS PLD_ICUISTS | ||
66 | #define M32R_INT1ICU_IRQ_BASE M32104UT_PLD_IRQ_BASE | ||
47 | #endif /* CONFIG_PLAT_M32104 */ | 67 | #endif /* CONFIG_PLAT_M32104 */ |
48 | 68 | ||
49 | /* | 69 | /* |