diff options
Diffstat (limited to 'firmware/target/arm/imx233/lradc-imx233.c')
-rw-r--r-- | firmware/target/arm/imx233/lradc-imx233.c | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/firmware/target/arm/imx233/lradc-imx233.c b/firmware/target/arm/imx233/lradc-imx233.c index d95a002663..db44f9100a 100644 --- a/firmware/target/arm/imx233/lradc-imx233.c +++ b/firmware/target/arm/imx233/lradc-imx233.c | |||
@@ -66,10 +66,8 @@ void imx233_lradc_set_channel_irq_callback(int channel, lradc_irq_fn_t cb) | |||
66 | imx233_icoll_enable_interrupt(INT_SRC_LRADC_CHx(channel), cb != NULL); | 66 | imx233_icoll_enable_interrupt(INT_SRC_LRADC_CHx(channel), cb != NULL); |
67 | } | 67 | } |
68 | 68 | ||
69 | void imx233_lradc_setup_channel(int channel, bool div2, bool acc, int nr_samples, int src) | 69 | void imx233_lradc_setup_source(int channel, bool div2, int src) |
70 | { | 70 | { |
71 | HW_LRADC_CHn_CLR(channel) = BM_OR2(LRADC_CHn, NUM_SAMPLES, ACCUMULATE); | ||
72 | HW_LRADC_CHn_SET(channel) = BF_OR2(LRADC_CHn, NUM_SAMPLES(nr_samples), ACCUMULATE(acc)); | ||
73 | if(div2) | 71 | if(div2) |
74 | BF_SETV(LRADC_CTRL2, DIVIDE_BY_TWO, 1 << channel); | 72 | BF_SETV(LRADC_CTRL2, DIVIDE_BY_TWO, 1 << channel); |
75 | else | 73 | else |
@@ -93,6 +91,12 @@ void imx233_lradc_setup_channel(int channel, bool div2, bool acc, int nr_samples | |||
93 | #endif | 91 | #endif |
94 | } | 92 | } |
95 | 93 | ||
94 | void imx233_lradc_setup_sampling(int channel, bool acc, int nr_samples) | ||
95 | { | ||
96 | HW_LRADC_CHn_CLR(channel) = BM_OR2(LRADC_CHn, NUM_SAMPLES, ACCUMULATE); | ||
97 | HW_LRADC_CHn_SET(channel) = BF_OR2(LRADC_CHn, NUM_SAMPLES(nr_samples), ACCUMULATE(acc)); | ||
98 | } | ||
99 | |||
96 | void imx233_lradc_setup_delay(int dchan, int trigger_lradc, int trigger_delays, | 100 | void imx233_lradc_setup_delay(int dchan, int trigger_lradc, int trigger_delays, |
97 | int loop_count, int delay) | 101 | int loop_count, int delay) |
98 | { | 102 | { |
@@ -202,8 +206,10 @@ void imx233_lradc_reserve_delay(int channel) | |||
202 | #if IMX233_SUBTARGET >= 3700 | 206 | #if IMX233_SUBTARGET >= 3700 |
203 | int imx233_lradc_sense_die_temperature(int nmos_chan, int pmos_chan) | 207 | int imx233_lradc_sense_die_temperature(int nmos_chan, int pmos_chan) |
204 | { | 208 | { |
205 | imx233_lradc_setup_channel(nmos_chan, false, false, 0, LRADC_SRC_NMOS_THIN); | 209 | imx233_lradc_setup_source(nmos_chan, false, LRADC_SRC_NMOS_THIN); |
206 | imx233_lradc_setup_channel(pmos_chan, false, false, 0, LRADC_SRC_PMOS_THIN); | 210 | imx233_lradc_setup_sampling(nmos_chan, false, 0); |
211 | imx233_lradc_setup_source(pmos_chan, false, LRADC_SRC_PMOS_THIN); | ||
212 | imx233_lradc_setup_sampling(pmos_chan, false, 0); | ||
207 | // mux sensors | 213 | // mux sensors |
208 | BF_CLR(LRADC_CTRL2, TEMPSENSE_PWD); | 214 | BF_CLR(LRADC_CTRL2, TEMPSENSE_PWD); |
209 | imx233_lradc_clear_channel(nmos_chan); | 215 | imx233_lradc_clear_channel(nmos_chan); |
@@ -247,7 +253,8 @@ int imx233_lradc_sense_ext_temperature(int chan, int sensor) | |||
247 | { | 253 | { |
248 | #define EXT_TEMP_ACC_COUNT 5 | 254 | #define EXT_TEMP_ACC_COUNT 5 |
249 | /* setup channel */ | 255 | /* setup channel */ |
250 | imx233_lradc_setup_channel(chan, false, false, 0, sensor); | 256 | imx233_lradc_setup_source(chan, false, sensor); |
257 | imx233_lradc_setup_sampling(chan, false, 0); | ||
251 | /* set current source to 300µA */ | 258 | /* set current source to 300µA */ |
252 | imx233_lradc_set_temp_isrc(sensor, BV_LRADC_CTRL2_TEMP_ISRC0__300); | 259 | imx233_lradc_set_temp_isrc(sensor, BV_LRADC_CTRL2_TEMP_ISRC0__300); |
253 | /* read value and accumulate */ | 260 | /* read value and accumulate */ |
@@ -350,7 +357,8 @@ void imx233_lradc_init(void) | |||
350 | battery_chan = 7; | 357 | battery_chan = 7; |
351 | imx233_lradc_reserve_channel(battery_chan); | 358 | imx233_lradc_reserve_channel(battery_chan); |
352 | /* setup them for the simplest use: no accumulation, no division*/ | 359 | /* setup them for the simplest use: no accumulation, no division*/ |
353 | imx233_lradc_setup_channel(battery_chan, false, false, 0, LRADC_SRC_BATTERY); | 360 | imx233_lradc_setup_source(battery_chan, false, LRADC_SRC_BATTERY); |
361 | imx233_lradc_setup_sampling(battery_chan, false, 0); | ||
354 | /* setup delay channel for battery for automatic reading and scaling */ | 362 | /* setup delay channel for battery for automatic reading and scaling */ |
355 | battery_delay_chan = 0; | 363 | battery_delay_chan = 0; |
356 | imx233_lradc_reserve_delay(battery_delay_chan); | 364 | imx233_lradc_reserve_delay(battery_delay_chan); |