diff options
| author | Zhou Jingyu <b02241@freescale.com> | 2010-03-26 14:52:10 +0800 |
|---|---|---|
| committer | Alejandro Gonzalez <alex.gonzalez@digi.com> | 2010-05-25 11:20:18 +0200 |
| commit | adc35bc6774be38f3dc3763c8f7b2ec58e020f2e (patch) | |
| tree | 9ac20c9fbc327e9ce2fe2d61fada8ff7f6fd5161 /arch/arm/mach-mx28 | |
| parent | c3d20d0e8317f33d921700f442c698c190c4a4b3 (diff) | |
ENGR00122040 mxs battery driver: fix lradc conflict
use configurable lraadc channel for tempreture
increase conditioning current
fix build warnings
Signed-off-by: Zhou Jingyu <Jingyu.Zhou@freescale.com>
Signed-off-by: Alejandro Gonzalez <alex.gonzalez@digi.com>
Diffstat (limited to 'arch/arm/mach-mx28')
| -rw-r--r-- | arch/arm/mach-mx28/device.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-mx28/device.c b/arch/arm/mach-mx28/device.c index 33ee4b63890a..8e1d27fb1213 100644 --- a/arch/arm/mach-mx28/device.c +++ b/arch/arm/mach-mx28/device.c @@ -987,7 +987,7 @@ static ddi_bc_Cfg_t battery_data = { .u16CurrentRampSlope = 75, /* mA/s */ .u16ConditioningThresholdVoltage = 2900, /* mV */ .u16ConditioningMaxVoltage = 3000, /* mV */ - .u16ConditioningCurrent = 60, /* mA */ + .u16ConditioningCurrent = 160, /* mA */ .u32ConditioningTimeout = 4*60*60*1000, /* ms (4 hours) */ .u16ChargingVoltage = 4200, /* mV */ /* FIXME: the current comparator could have h/w bugs in current @@ -1001,7 +1001,7 @@ static ddi_bc_Cfg_t battery_data = { .u8DieTempLow = 65, /* deg centigrade */ .u16DieTempSafeCurrent = 0, /* mA */ .monitorBatteryTemp = 0, /* Monitor the battery*/ - .u8BatteryTempChannel = 1, /* LRADC 1 */ + .u8BatteryTempChannel = 0, /* LRADC 0 */ .u16BatteryTempHigh = 642, /* Unknown units */ .u16BatteryTempLow = 497, /* Unknown units */ .u16BatteryTempSafeCurrent = 0, /* mA */ |