From: hhb <hhb@rock-chips.com>
Date: Thu, 20 Dec 2012 02:05:11 +0000 (+0800)
Subject: DS975: change BATTERY_RK30_ADC to BATTERY_RK30_ADC_FAC
X-Git-Tag: firefly_0821_release~8091
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=966f8f27c5d21efc92b9d71f78ce5fa6efc90227;p=firefly-linux-kernel-4.4.55.git

DS975: change BATTERY_RK30_ADC to BATTERY_RK30_ADC_FAC
---

diff --git a/arch/arm/configs/rk30_ds975_defconfig b/arch/arm/configs/rk30_ds975_defconfig
index fdb82b376cf0..570826bd840b 100644
--- a/arch/arm/configs/rk30_ds975_defconfig
+++ b/arch/arm/configs/rk30_ds975_defconfig
@@ -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
diff --git a/arch/arm/mach-rk30/board-rk30-ds975.c b/arch/arm/mach-rk30/board-rk30-ds975.c
index c20995dc6a9d..0cdeb8926789 100755
--- a/arch/arm/mach-rk30/board-rk30-ds975.c
+++ b/arch/arm/mach-rk30/board-rk30-ds975.c
@@ -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