diff options
Diffstat (limited to 'firmware/target/arm/imx233')
-rw-r--r-- | firmware/target/arm/imx233/adc-imx233.c | 6 | ||||
-rw-r--r-- | firmware/target/arm/imx233/adc-imx233.h | 1 | ||||
-rw-r--r-- | firmware/target/arm/imx233/sansa-fuzeplus/adc-fuzeplus.c | 4 |
3 files changed, 4 insertions, 7 deletions
diff --git a/firmware/target/arm/imx233/adc-imx233.c b/firmware/target/arm/imx233/adc-imx233.c index 5e9717b922..21447bbda7 100644 --- a/firmware/target/arm/imx233/adc-imx233.c +++ b/firmware/target/arm/imx233/adc-imx233.c | |||
@@ -59,6 +59,7 @@ void adc_init(void) | |||
59 | * conversions per seconds */ | 59 | * conversions per seconds */ |
60 | imx233_lradc_setup_delay(battery_delay_chan, 1 << battery_chan, | 60 | imx233_lradc_setup_delay(battery_delay_chan, 1 << battery_chan, |
61 | 1 << battery_delay_chan, 0, 200); | 61 | 1 << battery_delay_chan, 0, 200); |
62 | imx233_lradc_kick_delay(battery_delay_chan); | ||
62 | /* enable automatic conversion, use Li-Ion type battery */ | 63 | /* enable automatic conversion, use Li-Ion type battery */ |
63 | imx233_lradc_setup_battery_conversion(true, HW_LRADC_CONVERSION__SCALE_FACTOR__LI_ION); | 64 | imx233_lradc_setup_battery_conversion(true, HW_LRADC_CONVERSION__SCALE_FACTOR__LI_ION); |
64 | } | 65 | } |
@@ -86,12 +87,9 @@ unsigned short adc_read_virtual(int c) | |||
86 | switch(c) | 87 | switch(c) |
87 | { | 88 | { |
88 | case IMX233_ADC_BATTERY: | 89 | case IMX233_ADC_BATTERY: |
89 | return /*imx233_lradc_read_battery_voltage()*/adc_read_physical_ex(battery_chan); | 90 | return adc_read_physical_ex(battery_chan); |
90 | case IMX233_ADC_VDDIO: | 91 | case IMX233_ADC_VDDIO: |
91 | return adc_read_physical_ex(vddio_chan); | 92 | return adc_read_physical_ex(vddio_chan); |
92 | case IMX233_ADC_5V: | ||
93 | /* channel 15 5V has a 4:1 built it divider */ | ||
94 | return adc_read_physical(HW_LRADC_CHANNEL_5V) * 4; | ||
95 | case IMX233_ADC_DIE_TEMP: | 93 | case IMX233_ADC_DIE_TEMP: |
96 | // do kelvin to celsius conversion | 94 | // do kelvin to celsius conversion |
97 | return imx233_lradc_sense_die_temperature(nmos_chan, pmos_chan) - 273; | 95 | return imx233_lradc_sense_die_temperature(nmos_chan, pmos_chan) - 273; |
diff --git a/firmware/target/arm/imx233/adc-imx233.h b/firmware/target/arm/imx233/adc-imx233.h index 7468fbe3c3..6025fdcdf8 100644 --- a/firmware/target/arm/imx233/adc-imx233.h +++ b/firmware/target/arm/imx233/adc-imx233.h | |||
@@ -29,7 +29,6 @@ | |||
29 | #define IMX233_ADC_BATTERY -1 /* Battery voltage (mV) */ | 29 | #define IMX233_ADC_BATTERY -1 /* Battery voltage (mV) */ |
30 | #define IMX233_ADC_DIE_TEMP -2 /* Die temperature (°C) */ | 30 | #define IMX233_ADC_DIE_TEMP -2 /* Die temperature (°C) */ |
31 | #define IMX233_ADC_VDDIO -3 /* VddIO voltage (mV) */ | 31 | #define IMX233_ADC_VDDIO -3 /* VddIO voltage (mV) */ |
32 | #define IMX233_ADC_5V -4 /* Vdd5V voltage (mV) */ | ||
33 | 32 | ||
34 | /* Channel mapping */ | 33 | /* Channel mapping */ |
35 | extern int imx233_adc_mapping[]; | 34 | extern int imx233_adc_mapping[]; |
diff --git a/firmware/target/arm/imx233/sansa-fuzeplus/adc-fuzeplus.c b/firmware/target/arm/imx233/sansa-fuzeplus/adc-fuzeplus.c index 2da440b170..78b88c9e85 100644 --- a/firmware/target/arm/imx233/sansa-fuzeplus/adc-fuzeplus.c +++ b/firmware/target/arm/imx233/sansa-fuzeplus/adc-fuzeplus.c | |||
@@ -26,12 +26,12 @@ int imx233_adc_mapping[] = | |||
26 | [ADC_BATTERY] = IMX233_ADC_BATTERY, | 26 | [ADC_BATTERY] = IMX233_ADC_BATTERY, |
27 | [ADC_DIE_TEMP] = IMX233_ADC_DIE_TEMP, | 27 | [ADC_DIE_TEMP] = IMX233_ADC_DIE_TEMP, |
28 | [ADC_VDDIO] = IMX233_ADC_VDDIO, | 28 | [ADC_VDDIO] = IMX233_ADC_VDDIO, |
29 | [ADC_5V] = IMX233_ADC_5V, | 29 | [ADC_5V] = HW_LRADC_CHANNEL_5V, |
30 | }; | 30 | }; |
31 | 31 | ||
32 | const char *imx233_adc_channel_name[] = | 32 | const char *imx233_adc_channel_name[] = |
33 | { | 33 | { |
34 | "Battery(mV)", | 34 | "Battery(raw)", |
35 | "Die temperature(°C)", | 35 | "Die temperature(°C)", |
36 | "VddIO", | 36 | "VddIO", |
37 | "Vdd5V", | 37 | "Vdd5V", |