michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: adc: lmp90xxx: move calibration setup to acquisition thread

Browse source 
Move calibration setup SPI transaction to acquisition thread to allow
adc_read_async() to be called from ISR context.

Signed-off-by: Henrik Brix Andersen <hebad@vestas.com>
This commit is contained in:
Henrik Brix Andersen 2020-03-26 12:43:28 +01:00 • committed by Kumar Gala
commit 15be7a5723
1 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

29
drivers/adc/adc_lmp90xxx.c
View file

@ -129,6 +129,7 @@ struct lmp90xxx_data {
s32_t *buffer; s32_t *buffer;
s32_t *repeat_buffer; s32_t *repeat_buffer;
u32_t channels; u32_t channels;
bool calibrate;
u8_t channel_odr[LMP90XXX_MAX_CHANNELS]; u8_t channel_odr[LMP90XXX_MAX_CHANNELS];
#ifdef CONFIG_ADC_LMP90XXX_GPIO #ifdef CONFIG_ADC_LMP90XXX_GPIO
struct k_mutex gpio_lock; struct k_mutex gpio_lock;
@ -487,7 +488,6 @@ static int lmp90xxx_adc_start_read(struct device *dev,
{ {
const struct lmp90xxx_config *config = dev->config->config_info; const struct lmp90xxx_config *config = dev->config->config_info;
struct lmp90xxx_data *data = dev->driver_data; struct lmp90xxx_data *data = dev->driver_data;
u8_t bgcalcn = LMP90XXX_BGCALN(0x3); /* Default to BgCalMode3 */
int err; int err;
if (sequence->resolution != config->resolution) { if (sequence->resolution != config->resolution) {
@ -501,18 +501,8 @@ static int lmp90xxx_adc_start_read(struct device *dev,
return err; return err;
} }
if (sequence->calibrate) {
/* Use BgCalMode2 */
bgcalcn = LMP90XXX_BGCALN(0x2);
}
err = lmp90xxx_write_reg8(dev, LMP90XXX_REG_BGCALCN, bgcalcn);
if (err) {
LOG_ERR("failed to setup background calibration (err %d)", err);
return err;
}
data->buffer = sequence->buffer; data->buffer = sequence->buffer;
data->calibrate = sequence->calibrate;
adc_context_start_read(&data->ctx, sequence); adc_context_start_read(&data->ctx, sequence);
return adc_context_wait_for_completion(&data->ctx); return adc_context_wait_for_completion(&data->ctx);
@ -643,6 +633,7 @@ static int lmp90xxx_adc_read_channel(struct device *dev, u8_t channel,
static void lmp90xxx_acquisition_thread(struct device *dev) static void lmp90xxx_acquisition_thread(struct device *dev)
{ {
struct lmp90xxx_data *data = dev->driver_data; struct lmp90xxx_data *data = dev->driver_data;
u8_t bgcalcn = LMP90XXX_BGCALN(0x3); /* Default to BgCalMode3 */
s32_t result = 0; s32_t result = 0;
u8_t channel; u8_t channel;
int err; int err;
@ -650,6 +641,20 @@ static void lmp90xxx_acquisition_thread(struct device *dev)
while (true) { while (true) {
k_sem_take(&data->acq_sem, K_FOREVER); k_sem_take(&data->acq_sem, K_FOREVER);
if (data->calibrate) {
/* Use BgCalMode2 */
bgcalcn = LMP90XXX_BGCALN(0x2);
}
LOG_DBG("using BGCALCN = 0x%02x", bgcalcn);
err = lmp90xxx_write_reg8(dev, LMP90XXX_REG_BGCALCN, bgcalcn);
if (err) {
LOG_ERR("failed to setup background calibration "
"(err %d)", err);
adc_context_complete(&data->ctx, err);
break;
}
while (data->channels) { while (data->channels) {
channel = find_lsb_set(data->channels) - 1; channel = find_lsb_set(data->channels) - 1;