summaryrefslogtreecommitdiff
path: root/firmware/target/arm/s5l8700/ipodnano2g/powermgmt-nano2g.c
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/target/arm/s5l8700/ipodnano2g/powermgmt-nano2g.c')
-rw-r--r--firmware/target/arm/s5l8700/ipodnano2g/powermgmt-nano2g.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/firmware/target/arm/s5l8700/ipodnano2g/powermgmt-nano2g.c b/firmware/target/arm/s5l8700/ipodnano2g/powermgmt-nano2g.c
index 508995c436..937905f5f4 100644
--- a/firmware/target/arm/s5l8700/ipodnano2g/powermgmt-nano2g.c
+++ b/firmware/target/arm/s5l8700/ipodnano2g/powermgmt-nano2g.c
@@ -20,9 +20,8 @@
20 ****************************************************************************/ 20 ****************************************************************************/
21 21
22#include "config.h" 22#include "config.h"
23#include "adc.h"
24#include "adc-target.h"
25#include "powermgmt.h" 23#include "powermgmt.h"
24#include "pmu-target.h"
26 25
27const unsigned short battery_level_dangerous[BATTERY_TYPES_COUNT] = 26const unsigned short battery_level_dangerous[BATTERY_TYPES_COUNT] =
28{ 27{
@@ -52,14 +51,14 @@ const unsigned short percent_to_volt_charge[11] =
52}; 51};
53#endif /* CONFIG_CHARGING */ 52#endif /* CONFIG_CHARGING */
54 53
55/* ADC should read 0x3ff=5.12V */ 54/* ADC should read 0x3ff=6.00V */
56#define BATTERY_SCALE_FACTOR 5125 55#define BATTERY_SCALE_FACTOR 6000
57/* full-scale ADC readout (2^10) in millivolt */ 56/* full-scale ADC readout (2^10) in millivolt */
58 57
59 58
60/* Returns battery voltage from ADC [millivolts] */ 59/* Returns battery voltage from ADC [millivolts] */
61unsigned int battery_adc_voltage(void) 60unsigned int battery_adc_voltage(void)
62{ 61{
63 return 4000; 62 return pmu_read_battery_voltage();
64} 63}
65 64