len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-10 05:32:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

imx233: remove virtual 5V channel (value doesn't make sense), fix battery conversion (need to trigger delay)

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30986 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Amaury Pouly 2011-11-14 21:42:43 +00:00
parent f791a81e87
commit ea8570b48c
3 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
firmware/target/arm/imx233/adc-imx233.c
View file

@ -59,6 +59,7 @@ void adc_init(void)
* conversions per seconds */ * conversions per seconds */
imx233_lradc_setup_delay(battery_delay_chan, 1 << battery_chan, imx233_lradc_setup_delay(battery_delay_chan, 1 << battery_chan,
1 << battery_delay_chan, 0, 200); 1 << battery_delay_chan, 0, 200);
imx233_lradc_kick_delay(battery_delay_chan);
/* enable automatic conversion, use Li-Ion type battery */ /* enable automatic conversion, use Li-Ion type battery */
imx233_lradc_setup_battery_conversion(true, HW_LRADC_CONVERSION__SCALE_FACTOR__LI_ION); imx233_lradc_setup_battery_conversion(true, HW_LRADC_CONVERSION__SCALE_FACTOR__LI_ION);
} }
@ -86,12 +87,9 @@ unsigned short adc_read_virtual(int c)
switch(c) switch(c)
{ {
case IMX233_ADC_BATTERY: case IMX233_ADC_BATTERY:
return /*imx233_lradc_read_battery_voltage()*/adc_read_physical_ex(battery_chan); return adc_read_physical_ex(battery_chan);
case IMX233_ADC_VDDIO: case IMX233_ADC_VDDIO:
return adc_read_physical_ex(vddio_chan); return adc_read_physical_ex(vddio_chan);
case IMX233_ADC_5V:
/* channel 15 5V has a 4:1 built it divider */
return adc_read_physical(HW_LRADC_CHANNEL_5V) * 4;
case IMX233_ADC_DIE_TEMP: case IMX233_ADC_DIE_TEMP:
// do kelvin to celsius conversion // do kelvin to celsius conversion
return imx233_lradc_sense_die_temperature(nmos_chan, pmos_chan) - 273; return imx233_lradc_sense_die_temperature(nmos_chan, pmos_chan) - 273;

1
firmware/target/arm/imx233/adc-imx233.h
View file

@ -29,7 +29,6 @@
#define IMX233_ADC_BATTERY -1 /* Battery voltage (mV) */ #define IMX233_ADC_BATTERY -1 /* Battery voltage (mV) */
#define IMX233_ADC_DIE_TEMP -2 /* Die temperature (°C) */ #define IMX233_ADC_DIE_TEMP -2 /* Die temperature (°C) */
#define IMX233_ADC_VDDIO -3 /* VddIO voltage (mV) */ #define IMX233_ADC_VDDIO -3 /* VddIO voltage (mV) */
#define IMX233_ADC_5V -4 /* Vdd5V voltage (mV) */
/* Channel mapping */ /* Channel mapping */
extern int imx233_adc_mapping[]; extern int imx233_adc_mapping[];

4
firmware/target/arm/imx233/sansa-fuzeplus/adc-fuzeplus.c
View file

@ -26,12 +26,12 @@ int imx233_adc_mapping[] =
[ADC_BATTERY] = IMX233_ADC_BATTERY, [ADC_BATTERY] = IMX233_ADC_BATTERY,
[ADC_DIE_TEMP] = IMX233_ADC_DIE_TEMP, [ADC_DIE_TEMP] = IMX233_ADC_DIE_TEMP,
[ADC_VDDIO] = IMX233_ADC_VDDIO, [ADC_VDDIO] = IMX233_ADC_VDDIO,
[ADC_5V] = IMX233_ADC_5V, [ADC_5V] = HW_LRADC_CHANNEL_5V,
}; };
const char *imx233_adc_channel_name[] = const char *imx233_adc_channel_name[] =
{ {
"Battery(mV)", "Battery(raw)",
"Die temperature(°C)", "Die temperature(°C)",
"VddIO", "VddIO",
"Vdd5V", "Vdd5V",