summaryrefslogtreecommitdiff
path: root/firmware/target/arm
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/target/arm')
-rw-r--r--firmware/target/arm/pp/adc-pp5020.c3
-rw-r--r--firmware/target/arm/samsung/yh925/powermgmt-yh925.c10
2 files changed, 6 insertions, 7 deletions
diff --git a/firmware/target/arm/pp/adc-pp5020.c b/firmware/target/arm/pp/adc-pp5020.c
index 8afd88ff11..26d0d0d6ca 100644
--- a/firmware/target/arm/pp/adc-pp5020.c
+++ b/firmware/target/arm/pp/adc-pp5020.c
@@ -64,7 +64,8 @@ unsigned short adc_scan(int channel)
64 adcdata[channel] = (adc_data_1<<2 | adc_data_2); 64 adcdata[channel] = (adc_data_1<<2 | adc_data_2);
65 65
66#if !(defined(PHILIPS_HDD1630) || defined(PHILIPS_HDD6330) ||\ 66#if !(defined(PHILIPS_HDD1630) || defined(PHILIPS_HDD6330) ||\
67 defined(SAMSUNG_YH820) || defined(SAMSUNG_YH920)) 67 defined(SAMSUNG_YH820) || defined(SAMSUNG_YH920) ||\
68 defined(SAMSUNG_YH925))
68 /* ADC values read low if PLL is enabled */ 69 /* ADC values read low if PLL is enabled */
69 if(PLL_CONTROL & 0x80000000){ 70 if(PLL_CONTROL & 0x80000000){
70 adcdata[channel] += 0x14; 71 adcdata[channel] += 0x14;
diff --git a/firmware/target/arm/samsung/yh925/powermgmt-yh925.c b/firmware/target/arm/samsung/yh925/powermgmt-yh925.c
index ab9cbcdfc1..71a30aa8fc 100644
--- a/firmware/target/arm/samsung/yh925/powermgmt-yh925.c
+++ b/firmware/target/arm/samsung/yh925/powermgmt-yh925.c
@@ -24,28 +24,26 @@
24#include "adc.h" 24#include "adc.h"
25#include "powermgmt.h" 25#include "powermgmt.h"
26 26
27/* TODO: Not yet calibrated */
28
29const unsigned short battery_level_dangerous[BATTERY_TYPES_COUNT] = 27const unsigned short battery_level_dangerous[BATTERY_TYPES_COUNT] =
30{ 28{
31 3750 29 3659
32}; 30};
33 31
34const unsigned short battery_level_shutoff[BATTERY_TYPES_COUNT] = 32const unsigned short battery_level_shutoff[BATTERY_TYPES_COUNT] =
35{ 33{
36 3700 34 3609
37}; 35};
38 36
39/* voltages (millivolt) of 0%, 10%, ... 100% when charging disabled */ 37/* voltages (millivolt) of 0%, 10%, ... 100% when charging disabled */
40const unsigned short percent_to_volt_discharge[BATTERY_TYPES_COUNT][11] = 38const unsigned short percent_to_volt_discharge[BATTERY_TYPES_COUNT][11] =
41{ 39{
42 { 3700, 3822, 3880, 3909, 3946, 3976, 4024, 4086, 4141, 4223, 4307 } 40 { 3609, 3731, 3789, 3818, 3855, 3885, 3933, 3995, 4050, 4132, 4216 }
43}; 41};
44 42
45/* voltages (millivolt) of 0%, 10%, ... 100% when charging enabled */ 43/* voltages (millivolt) of 0%, 10%, ... 100% when charging enabled */
46const unsigned short percent_to_volt_charge[11] = 44const unsigned short percent_to_volt_charge[11] =
47{ 45{
48 3868, 3971, 3988, 3998, 4018, 4036, 4097, 4116, 4165, 4222, 4307 46 3777, 3880, 3897, 3907, 3927, 3945, 4006, 4025, 4074, 4131, 4216
49}; 47};
50 48
51#define BATTERY_SCALE_FACTOR 4650 49#define BATTERY_SCALE_FACTOR 4650