diff options
Diffstat (limited to 'firmware/target/arm/imx31/mc13783-imx31.c')
-rw-r--r-- | firmware/target/arm/imx31/mc13783-imx31.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/firmware/target/arm/imx31/mc13783-imx31.c b/firmware/target/arm/imx31/mc13783-imx31.c index 5146122327..9d8f6190a3 100644 --- a/firmware/target/arm/imx31/mc13783-imx31.c +++ b/firmware/target/arm/imx31/mc13783-imx31.c | |||
@@ -22,10 +22,11 @@ | |||
22 | #include "cpu.h" | 22 | #include "cpu.h" |
23 | #include "gpio-imx31.h" | 23 | #include "gpio-imx31.h" |
24 | #include "mc13783.h" | 24 | #include "mc13783.h" |
25 | #include "mc13783-target.h" | ||
25 | #include "debug.h" | 26 | #include "debug.h" |
26 | #include "kernel.h" | 27 | #include "kernel.h" |
27 | 28 | ||
28 | extern const struct mc13783_event_list mc13783_event_list; | 29 | extern const struct mc13783_event mc13783_events[MC13783_NUM_EVENTS]; |
29 | extern struct spi_node mc13783_spi; | 30 | extern struct spi_node mc13783_spi; |
30 | 31 | ||
31 | /* PMIC event service data */ | 32 | /* PMIC event service data */ |
@@ -107,8 +108,8 @@ static void mc13783_interrupt_thread(void) | |||
107 | * generated. */ | 108 | * generated. */ |
108 | imx31_regset32(&MC13783_GPIO_IMR, 1ul << MC13783_GPIO_LINE); | 109 | imx31_regset32(&MC13783_GPIO_IMR, 1ul << MC13783_GPIO_LINE); |
109 | 110 | ||
110 | event = mc13783_event_list.events; | 111 | event = mc13783_events; |
111 | event_last = event + mc13783_event_list.count; | 112 | event_last = event + MC13783_NUM_EVENTS; |
112 | 113 | ||
113 | /* .count is surely expected to be > 0 */ | 114 | /* .count is surely expected to be > 0 */ |
114 | do | 115 | do |
@@ -181,8 +182,7 @@ void mc13783_close(void) | |||
181 | 182 | ||
182 | bool mc13783_enable_event(enum mc13783_event_ids id) | 183 | bool mc13783_enable_event(enum mc13783_event_ids id) |
183 | { | 184 | { |
184 | const struct mc13783_event * const event = | 185 | const struct mc13783_event * const event = &mc13783_events[id]; |
185 | &mc13783_event_list.events[id]; | ||
186 | int set = event->set; | 186 | int set = event->set; |
187 | uint32_t mask = event->mask; | 187 | uint32_t mask = event->mask; |
188 | 188 | ||
@@ -198,8 +198,7 @@ bool mc13783_enable_event(enum mc13783_event_ids id) | |||
198 | 198 | ||
199 | void mc13783_disable_event(enum mc13783_event_ids id) | 199 | void mc13783_disable_event(enum mc13783_event_ids id) |
200 | { | 200 | { |
201 | const struct mc13783_event * const event = | 201 | const struct mc13783_event * const event = &mc13783_events[id]; |
202 | &mc13783_event_list.events[id]; | ||
203 | int set = event->set; | 202 | int set = event->set; |
204 | uint32_t mask = event->mask; | 203 | uint32_t mask = event->mask; |
205 | 204 | ||