Skip to content

F
FMC ADC 100M 14b 4cha - Software
Commit 58e8396d authored by Federico Vaga's avatar Federico Vaga
Browse files
Options

drv: temperature value is signed 

Signed-off-by: Federico Vaga's avatarFederico Vaga <federico.vaga@cern.ch>
parent c58bcaae
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
kernel/fa-calibration.c
View file @ 58e8396d
...@@ -128,7 +128,7 @@ static int fa_calib_dac_gain_fix(int range, int gain_c, int32_t delta_temp) ...@@ -128,7 +128,7 @@ static int fa_calib_dac_gain_fix(int range, int gain_c, int32_t delta_temp)
} }
static void fa_calib_adc_config_chan(struct fa_dev *fa, unsigned int chan, static void fa_calib_adc_config_chan(struct fa_dev *fa, unsigned int chan,
uint32_t temperature) int32_t temperature)
{ {
int range = fa->range[chan]; int range = fa->range[chan];
struct fa_calib_stanza *cal = &fa->calib.adc[range]; struct fa_calib_stanza *cal = &fa->calib.adc[range];
...@@ -202,7 +202,7 @@ static int fa_dac_offset_get(struct fa_dev *fa, unsigned int chan) ...@@ -202,7 +202,7 @@ static int fa_dac_offset_get(struct fa_dev *fa, unsigned int chan)
} }
static int fa_calib_dac_config_chan(struct fa_dev *fa, unsigned int chan, static int fa_calib_dac_config_chan(struct fa_dev *fa, unsigned int chan,
uint32_t temperature) int32_t temperature)
{ {
int range = fa->range[chan]; int range = fa->range[chan];
int32_t off_uv = fa_dac_offset_get(fa, chan); int32_t off_uv = fa_dac_offset_get(fa, chan);
...@@ -220,7 +220,7 @@ static int fa_calib_dac_config_chan(struct fa_dev *fa, unsigned int chan, ...@@ -220,7 +220,7 @@ static int fa_calib_dac_config_chan(struct fa_dev *fa, unsigned int chan,
return fa_dac_offset_set(fa, chan, hwval); return fa_dac_offset_set(fa, chan, hwval);
} }
void fa_calib_dac_config(struct fa_dev *fa, uint32_t temperature) void fa_calib_dac_config(struct fa_dev *fa, int32_t temperature)
{ {
int i; int i;
...@@ -235,7 +235,7 @@ void fa_calib_dac_config(struct fa_dev *fa, uint32_t temperature) ...@@ -235,7 +235,7 @@ void fa_calib_dac_config(struct fa_dev *fa, uint32_t temperature)
spin_unlock(&fa->zdev->cset->lock); spin_unlock(&fa->zdev->cset->lock);
} }
static void fa_calib_adc_config(struct fa_dev *fa, uint32_t temperature) static void fa_calib_adc_config(struct fa_dev *fa, int32_t temperature)
{ {
int err; int err;
int i; int i;
...@@ -257,7 +257,7 @@ static void fa_calib_adc_config(struct fa_dev *fa, uint32_t temperature) ...@@ -257,7 +257,7 @@ static void fa_calib_adc_config(struct fa_dev *fa, uint32_t temperature)
void fa_calib_config(struct fa_dev *fa) void fa_calib_config(struct fa_dev *fa)
{ {
uint32_t temperature; int32_t temperature;
temperature = fa_temperature_read(fa); temperature = fa_temperature_read(fa);
fa_calib_adc_config(fa, temperature); fa_calib_adc_config(fa, temperature);
......
kernel/fmc-adc-100m14b4cha.h
View file @ 58e8396d
...@@ -605,7 +605,7 @@ extern const struct zfa_field_desc zfad_regs[]; ...@@ -605,7 +605,7 @@ extern const struct zfa_field_desc zfad_regs[];
extern int zfad_fsm_command(struct fa_dev *fa, uint32_t command); extern int zfad_fsm_command(struct fa_dev *fa, uint32_t command);
extern void zfad_reset_offset(struct fa_dev *fa); extern void zfad_reset_offset(struct fa_dev *fa);
extern int zfad_convert_hw_range(uint32_t bitmask); extern int zfad_convert_hw_range(uint32_t bitmask);
extern uint32_t fa_temperature_read(struct fa_dev *fa); extern int32_t fa_temperature_read(struct fa_dev *fa);
/* Temporarily, user values are the same as hardware values */ /* Temporarily, user values are the same as hardware values */
extern int zfad_convert_user_range(uint32_t user_val); extern int zfad_convert_user_range(uint32_t user_val);
...@@ -646,7 +646,7 @@ extern void fa_spi_exit(struct fa_dev *fd); ...@@ -646,7 +646,7 @@ extern void fa_spi_exit(struct fa_dev *fd);
extern int fa_calib_init(struct fa_dev *fa); extern int fa_calib_init(struct fa_dev *fa);
extern void fa_calib_exit(struct fa_dev *fa); extern void fa_calib_exit(struct fa_dev *fa);
extern void fa_calib_config(struct fa_dev *fa); extern void fa_calib_config(struct fa_dev *fa);
extern void fa_calib_dac_config(struct fa_dev *fa, uint32_t temperature); extern void fa_calib_dac_config(struct fa_dev *fa, int32_t temperature);
/* functions exported by fa-debug.c */ /* functions exported by fa-debug.c */
extern int fa_debug_init(struct fa_dev *fa); extern int fa_debug_init(struct fa_dev *fa);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment