Improve imx31 interrupt code for PMIC and GPIO

Fix stuff that was bugging me about the way I did it at first.

While messing around I found RDS code wasn't masking its GPIO
ISR as it should, which might lead to two different interrupts
messing with the static data.

Change-Id: I54626809ea3039a842af0cc9e3e42853326c4193

1 files changed, 2 insertions, 2 deletions

diff --git a/firmware/target/arm/imx31/gigabeat-s/adc-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/adc-gigabeat-s.c
index b46fc2f63f..2a89a82e46 100644
--- a/firmware/target/arm/imx31/gigabeat-s/adc-gigabeat-s.c
+++ b/firmware/target/arm/imx31/gigabeat-s/adc-gigabeat-s.c
@@ -111,7 +111,7 @@ bool adc_enable_channel(int channel, bool enable)
 }
 
 /* ADC conversion complete event - called from PMIC ISR */
-void adc_done(void)
+void MC13783_EVENT_CB_ADCDONE(void)
 {
     semaphore_release(&adc_done_signal);
 }
@@ -132,5 +132,5 @@ void adc_init(void)
 
     /* Enable ADCDONE event */
     mc13783_write(MC13783_INTERRUPT_STATUS0, MC13783_ADCDONEI);
-    mc13783_enable_event(MC13783_ADCDONE_EVENT, true);
+    mc13783_enable_event(MC13783_INT_ID_ADCDONE, true);
 }