summaryrefslogtreecommitdiff
path: root/firmware/target/arm/imx31/gigabeat-s/powermgmt-imx31.c
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/target/arm/imx31/gigabeat-s/powermgmt-imx31.c')
-rw-r--r--firmware/target/arm/imx31/gigabeat-s/powermgmt-imx31.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/firmware/target/arm/imx31/gigabeat-s/powermgmt-imx31.c b/firmware/target/arm/imx31/gigabeat-s/powermgmt-imx31.c
index 7441100a7d..53996f8cd7 100644
--- a/firmware/target/arm/imx31/gigabeat-s/powermgmt-imx31.c
+++ b/firmware/target/arm/imx31/gigabeat-s/powermgmt-imx31.c
@@ -48,13 +48,10 @@ const unsigned short percent_to_volt_charge[11] =
48 3480, 3550, 3590, 3610, 3630, 3650, 3700, 3760, 3800, 3910, 3990 48 3480, 3550, 3590, 3610, 3630, 3650, 3700, 3760, 3800, 3910, 3990
49}; 49};
50 50
51/* ADC[0] is (530) at discharge and 625 at full charge */
52#define BATTERY_SCALE_FACTOR 6605
53/* full-scale ADC readout (2^10) in millivolt */
54
55/* Returns battery voltage from ADC [millivolts] */ 51/* Returns battery voltage from ADC [millivolts] */
56unsigned int battery_adc_voltage(void) 52unsigned int battery_adc_voltage(void)
57{ 53{
58 return (adc_read(ADC_UNREG_POWER) * BATTERY_SCALE_FACTOR) >> 10; 54 /* ADC reading 0-1023 = 2400mV-4700mV */
55 return ((adc_read(ADC_BATTERY) * 2303) >> 10) + 2400;
59} 56}
60 57