From: hzf <hzf@rock-chips.com>
Date: Tue, 14 Feb 2012 07:36:58 +0000 (+0800)
Subject: td8801:updata config for charge display
X-Git-Tag: firefly_0821_release~9622
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0f95d977ba2076abb27b5e1c933ecf50e590184f;p=firefly-linux-kernel-4.4.55.git

td8801:updata config for charge display
---

diff --git a/arch/arm/configs/rk29_td8801_v2_defconfig b/arch/arm/configs/rk29_td8801_v2_defconfig
index 12980d69d31f..a9d0b7d587ed 100755
--- a/arch/arm/configs/rk29_td8801_v2_defconfig
+++ b/arch/arm/configs/rk29_td8801_v2_defconfig
@@ -1564,7 +1564,7 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_PDA_POWER is not set
 CONFIG_WM831X_BACKUP=y
 CONFIG_WM831X_POWER=y
-CONFIG_WM831X_CHARGER_DISPLAY=y
+# CONFIG_WM831X_CHARGER_DISPLAY is not set
 # CONFIG_WM831X_WITH_BATTERY is not set
 # CONFIG_TEST_POWER is not set
 # CONFIG_BATTERY_DS2780 is not set
@@ -1580,7 +1580,7 @@ CONFIG_WM831X_CHARGER_DISPLAY=y
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_GPIO is not set
 # CONFIG_BATTERY_RK29_ADC is not set
-# CONFIG_POWER_ON_CHARGER_DISPLAY is not set
+CONFIG_POWER_ON_CHARGER_DISPLAY=y
 # CONFIG_HWMON is not set
 # CONFIG_THERMAL is not set
 # CONFIG_WATCHDOG is not set
@@ -2032,6 +2032,7 @@ CONFIG_SND_RK29_SOC_WM8994=y
 # CONFIG_SND_RK29_CODEC_SOC_MASTER is not set
 CONFIG_SND_RK29_CODEC_SOC_SLAVE=y
 # CONFIG_ADJUST_VOL_BY_CODEC is not set
+# CONFIG_PHONE_INCALL_IS_SUSPEND is not set
 CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_ALL_CODECS is not set
 CONFIG_SND_SOC_WM_HUBS=y