github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-09 07:03:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

add rk2818 info config for dsp battery headset

Browse Source
This commit is contained in:
lhh 2010-08-27 10:42:43 +08:00
parent 85b4270444
commit 3f6b225ff5
2 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/configs/rk2818_info_defconfig
View File

@ -843,7 +843,7 @@ CONFIG_SPIM_RK2818=y
# CONFIG_SPI_SPIDEV is not set
# CONFIG_SPI_TLE62X0 is not set
# CONFIG_SPI_FPGA is not set
# CONFIG_HEADSET_DET is not set
CONFIG_HEADSET_DET=y
#
# PPS support
@ -893,7 +893,7 @@ CONFIG_POWER_SUPPLY=y
# CONFIG_BATTERY_DS2782 is not set
# CONFIG_BATTERY_BQ27x00 is not set
# CONFIG_BATTERY_MAX17040 is not set
# CONFIG_BATTERY_RK2818 is not set
CONFIG_BATTERY_RK2818=y
# CONFIG_HWMON is not set
# CONFIG_THERMAL is not set
# CONFIG_WATCHDOG is not set
@ -1425,7 +1425,7 @@ CONFIG_ANDROID_LOW_MEMORY_KILLER=y
#
# DSP
#
# CONFIG_RK2818_DSP is not set
CONFIG_RK2818_DSP=y
#
# RK1000 control

20
drivers/power/rk2818_battery.c
View File

@ -376,21 +376,7 @@ static void rk2818_battery_timer_work(struct work_struct *work)
gBatLastStatus = gBatStatus;
gBatLastPresent = gBatPresent;
gBatLastCapacity = gBatCapacity;
if(!( strstr(saved_command_line,"nfsroot=") ) )
{
power_supply_changed(&gBatteryData->battery);
}
else
{
DBG("voltage has changed\n");
DBG("gBatStatus=%d,gBatHealth=%d,gBatPresent=%d\n",gBatStatus,gBatHealth,gBatPresent);
if(gBatVoltageValue[1] == 0)
DBG("gBatVoltage=%d\n",gBatVoltage);
else
DBG("gBatVoltage=%d\n",gBatVoltageValue[1]);
DBG("gBatCapacity=%d%%\n",gBatCapacity);
}
power_supply_changed(&gBatteryData->battery);
}
@ -541,8 +527,8 @@ static int rk2818_battery_resume(struct platform_device *dev)
return 0;
}
#else
#define tosa_bat_suspend NULL
#define tosa_bat_resume NULL
#define rk2818_battery_suspend NULL
#define rk2818_battery_resume NULL
#endif