diff options
Diffstat (limited to 'firmware/target/arm/imx31/gigabeat-s/button-imx31.c')
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/button-imx31.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/firmware/target/arm/imx31/gigabeat-s/button-imx31.c b/firmware/target/arm/imx31/gigabeat-s/button-imx31.c index d2a46f2c9f..505ba397d9 100644 --- a/firmware/target/arm/imx31/gigabeat-s/button-imx31.c +++ b/firmware/target/arm/imx31/gigabeat-s/button-imx31.c | |||
@@ -197,7 +197,7 @@ void button_init_device(void) | |||
197 | #endif | 197 | #endif |
198 | 198 | ||
199 | /* Enable keypad clock */ | 199 | /* Enable keypad clock */ |
200 | imx31_clkctl_module_clock_gating(CG_KPP, CGM_ON_ALL); | 200 | ccm_module_clock_gating(CG_KPP, CGM_ON_RUN_WAIT); |
201 | 201 | ||
202 | /* 1. Enable number of rows in keypad (KPCR[4:0]) | 202 | /* 1. Enable number of rows in keypad (KPCR[4:0]) |
203 | * | 203 | * |
@@ -219,8 +219,7 @@ void button_init_device(void) | |||
219 | * 6. Set the KDIE control bit bit. */ | 219 | * 6. Set the KDIE control bit bit. */ |
220 | KPP_KPSR = KPP_KPSR_KDIE | KPP_KPSR_KRSS | KPP_KPSR_KDSC | KPP_KPSR_KPKD; | 220 | KPP_KPSR = KPP_KPSR_KDIE | KPP_KPSR_KRSS | KPP_KPSR_KDSC | KPP_KPSR_KPKD; |
221 | 221 | ||
222 | /* KPP IRQ at priority 3 */ | 222 | avic_enable_int(INT_KPP, INT_TYPE_IRQ, INT_PRIO_DEFAULT, KPP_HANDLER); |
223 | avic_enable_int(KPP, IRQ, 3, KPP_HANDLER); | ||
224 | 223 | ||
225 | button_power_event(); | 224 | button_power_event(); |
226 | mc13783_enable_event(MC13783_ONOFD1_EVENT); | 225 | mc13783_enable_event(MC13783_ONOFD1_EVENT); |
@@ -235,7 +234,7 @@ void button_close_device(void) | |||
235 | { | 234 | { |
236 | int oldlevel = disable_irq_save(); | 235 | int oldlevel = disable_irq_save(); |
237 | 236 | ||
238 | avic_disable_int(KPP); | 237 | avic_disable_int(INT_KPP); |
239 | KPP_KPSR &= ~(KPP_KPSR_KRIE | KPP_KPSR_KDIE); | 238 | KPP_KPSR &= ~(KPP_KPSR_KRIE | KPP_KPSR_KDIE); |
240 | int_btn = BUTTON_NONE; | 239 | int_btn = BUTTON_NONE; |
241 | 240 | ||