diff options
Diffstat (limited to 'arch/m32r/kernel/setup_mappi2.c')
-rw-r--r-- | arch/m32r/kernel/setup_mappi2.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/m32r/kernel/setup_mappi2.c b/arch/m32r/kernel/setup_mappi2.c index 1904d465a507..248fc658dbd5 100644 --- a/arch/m32r/kernel/setup_mappi2.c +++ b/arch/m32r/kernel/setup_mappi2.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * linux/arch/m32r/kernel/setup_mappi.c | 2 | * linux/arch/m32r/kernel/setup_mappi2.c |
3 | * | 3 | * |
4 | * Setup routines for Renesas MAPPI-II(M3A-ZA36) Board | 4 | * Setup routines for Renesas MAPPI-II(M3A-ZA36) Board |
5 | * | 5 | * |
@@ -156,7 +156,6 @@ void __init init_IRQ(void) | |||
156 | irq_desc[PLD_IRQ_CFIREQ].handler = &mappi2_irq_type; | 156 | irq_desc[PLD_IRQ_CFIREQ].handler = &mappi2_irq_type; |
157 | irq_desc[PLD_IRQ_CFIREQ].action = 0; | 157 | irq_desc[PLD_IRQ_CFIREQ].action = 0; |
158 | irq_desc[PLD_IRQ_CFIREQ].depth = 1; /* disable nested irq */ | 158 | irq_desc[PLD_IRQ_CFIREQ].depth = 1; /* disable nested irq */ |
159 | // icu_data[PLD_IRQ_CFIREQ].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD00; | ||
160 | icu_data[PLD_IRQ_CFIREQ].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD01; | 159 | icu_data[PLD_IRQ_CFIREQ].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD01; |
161 | disable_mappi2_irq(PLD_IRQ_CFIREQ); | 160 | disable_mappi2_irq(PLD_IRQ_CFIREQ); |
162 | 161 | ||
@@ -167,7 +166,6 @@ void __init init_IRQ(void) | |||
167 | irq_desc[PLD_IRQ_CFC_INSERT].action = 0; | 166 | irq_desc[PLD_IRQ_CFC_INSERT].action = 0; |
168 | irq_desc[PLD_IRQ_CFC_INSERT].depth = 1; /* disable nested irq */ | 167 | irq_desc[PLD_IRQ_CFC_INSERT].depth = 1; /* disable nested irq */ |
169 | icu_data[PLD_IRQ_CFC_INSERT].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD00; | 168 | icu_data[PLD_IRQ_CFC_INSERT].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD00; |
170 | // icu_data[PLD_IRQ_CFC_INSERT].icucr = 0; | ||
171 | disable_mappi2_irq(PLD_IRQ_CFC_INSERT); | 169 | disable_mappi2_irq(PLD_IRQ_CFC_INSERT); |
172 | 170 | ||
173 | /* ICUCR42: CFC Eject */ | 171 | /* ICUCR42: CFC Eject */ |
@@ -176,9 +174,7 @@ void __init init_IRQ(void) | |||
176 | irq_desc[PLD_IRQ_CFC_EJECT].action = 0; | 174 | irq_desc[PLD_IRQ_CFC_EJECT].action = 0; |
177 | irq_desc[PLD_IRQ_CFC_EJECT].depth = 1; /* disable nested irq */ | 175 | irq_desc[PLD_IRQ_CFC_EJECT].depth = 1; /* disable nested irq */ |
178 | icu_data[PLD_IRQ_CFC_EJECT].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD10; | 176 | icu_data[PLD_IRQ_CFC_EJECT].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD10; |
179 | // icu_data[PLD_IRQ_CFC_EJECT].icucr = 0; | ||
180 | disable_mappi2_irq(PLD_IRQ_CFC_EJECT); | 177 | disable_mappi2_irq(PLD_IRQ_CFC_EJECT); |
181 | |||
182 | #endif /* CONFIG_MAPPI2_CFC */ | 178 | #endif /* CONFIG_MAPPI2_CFC */ |
183 | } | 179 | } |
184 | 180 | ||