diff options
author | Amaury Pouly <pamaury@rockbox.org> | 2011-11-14 21:42:43 +0000 |
---|---|---|
committer | Amaury Pouly <pamaury@rockbox.org> | 2011-11-14 21:42:43 +0000 |
commit | ea8570b48c13b7d86704652cac00934f8831b474 (patch) | |
tree | 5fde2873172a22fb303a57a1e49ebe5eaf3929bc /firmware/target/arm/imx233/adc-imx233.c | |
parent | f791a81e87fc6a4a680158e0c92dcd562de8fbbb (diff) | |
download | rockbox-ea8570b48c13b7d86704652cac00934f8831b474.tar.gz rockbox-ea8570b48c13b7d86704652cac00934f8831b474.zip |
imx233: remove virtual 5V channel (value doesn't make sense), fix battery conversion (need to trigger delay)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30986 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/imx233/adc-imx233.c')
-rw-r--r-- | firmware/target/arm/imx233/adc-imx233.c | 6 |
1 files changed, 2 insertions, 4 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; |