diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2009-09-11 12:49:39 +0100 |
|---|---|---|
| committer | Thomas White <taw@bitwiz.org.uk> | 2009-09-11 12:49:39 +0100 |
| commit | cd38bcdac64aec45575ed58de66db4a2fbf1914d (patch) | |
| tree | 450333c7a1c67685db627edda3e1376a5bd46a2e /arch/arm/mach-s3c2410/mach-gta01.c | |
| parent | 166226209d59b1210cadfdec6b31e7d633100d9d (diff) | |
| parent | a3587e4ed77974adfb057af261aaeea4022018e8 (diff) | |
Merge commit 'remotes/openmoko/andy-tracking' into drm-tracking
Diffstat (limited to 'arch/arm/mach-s3c2410/mach-gta01.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/mach-gta01.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c index 1fe3eef2257..8a13a4adcfd 100644 --- a/arch/arm/mach-s3c2410/mach-gta01.c +++ b/arch/arm/mach-s3c2410/mach-gta01.c @@ -237,7 +237,7 @@ static int gta01_bat_get_voltage(void) adc = pcf50606_adc_sync_read(pcf, PCF50606_ADCMUX_BATVOLT_RES); mv = (adc * 6000) / 1024; - return mv; + return mv * 1000; } static int gta01_bat_get_current(void) @@ -248,10 +248,10 @@ static int gta01_bat_get_current(void) adc_battvolt = pcf50606_adc_sync_read(pcf, PCF50606_ADCMUX_BATVOLT_SUBTR); adc_adcin1 = pcf50606_adc_sync_read(pcf, PCF50606_ADCMUX_ADCIN1_SUBTR); - res = (adc_adcin1 - adc_battvolt) * 2400; + res = (adc_battvolt - adc_adcin1) * 2400; /*rsense is 220 milli */ - return (res * 1000) / (220 * 1024); + return (res * 1000) / (220 * 1024) * 1000; } static struct gta01_bat_platform_data gta01_bat_pdata = { |