shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

DS975: change BATTERY_RK30_ADC to BATTERY_RK30_ADC_FAC

Browse Source
This commit is contained in:
hhb
2012-12-20 10:05:11 +08:00
parent 76786e4b5e
commit 966f8f27c5
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/configs/rk30_ds975_defconfig
View File

@@ -281,8 +281,9 @@ CONFIG_SPI_FPGA_GPIO_NUM=0
CONFIG_SPI_FPGA_GPIO_IRQ_NUM=0
CONFIG_POWER_SUPPLY=y
CONFIG_TEST_POWER=y
CONFIG_BATTERY_RK30_ADC=y
CONFIG_BATTERY_RK30_ADC_FAC=y
CONFIG_BATTERY_RK30_AC_CHARGE=y
CONFIG_BATTERY_RK30_VOL3V8=y
# CONFIG_HWMON is not set
CONFIG_MFD_WM831X_I2C=y
CONFIG_REGULATOR=y

4
arch/arm/mach-rk30/board-rk30-ds975.c
View File

@@ -1609,7 +1609,7 @@ struct rk29_sdmmc_platform_data default_sdmmc1_data = {
* the end of setting for SDMMC devices
**************************************************************************************************/
#ifdef CONFIG_BATTERY_RK30_ADC
#ifdef CONFIG_BATTERY_RK30_ADC_FAC
static struct rk30_adc_battery_platform_data rk30_adc_battery_platdata = {
.dc_det_pin = RK30_PIN6_PA5,
.batt_low_pin = RK30_PIN6_PA0,
@@ -1739,7 +1739,7 @@ static struct platform_device *devices[] __initdata = {
#ifdef CONFIG_RFKILL_RK
&device_rfkill_rk,
#endif
#ifdef CONFIG_BATTERY_RK30_ADC
#ifdef CONFIG_BATTERY_RK30_ADC_FAC
&rk30_device_adc_battery,
#endif
#ifdef CONFIG_BATTERY_RK29_ADC