rk29: phonesdk: defconfig: use new charger display, new G3 logo

diff --git a/arch/arm/configs/rk29_phonesdk_defconfig b/arch/arm/configs/rk29_phonesdk_defconfig
index 8f4d09c735193e2171ee6ed46d2881a6968104b2..384266bef8c895fc3be50f756a742fb0f188d70a 100755 (executable)
--- a/arch/arm/configs/rk29_phonesdk_defconfig
+++ b/arch/arm/configs/rk29_phonesdk_defconfig
@@ -264,17 +264,14 @@ CONFIG_ARCH_RK29=y
 # CONFIG_KEYBOARD_GPIO_POLLED is not set
 # CONFIG_MACH_RK29SDK is not set
 # CONFIG_MACH_RK29SDK_DDR3 is not set
-# CONFIG_MACH_RK29WINACCORD is not set
 # CONFIG_MACH_RK29_K97 is not set
 # CONFIG_MACH_RK29FIH is not set
-# CONFIG_MACH_RK29_MALATA is not set
 CONFIG_MACH_RK29_PHONESDK=y
 # CONFIG_MACH_RK29_A22 is not set
 # CONFIG_MACH_RK29_TD8801_V2 is not set
 # CONFIG_MACH_RK29_PHONEPADSDK is not set
 # CONFIG_MACH_RK29_newton is not set
 # CONFIG_MACH_RK29_PHONE_Z5 is not set
-# CONFIG_MACH_RK29_P91 is not set
 # CONFIG_DDR_TYPE_DDRII is not set
 CONFIG_DDR_TYPE_LPDDR=y
 # CONFIG_DDR_TYPE_DDR3_800D is not set
@@ -495,6 +492,7 @@ CONFIG_PM=y
 # CONFIG_PM_DEBUG is not set
 # CONFIG_APM_EMULATION is not set
 # CONFIG_SUSPEND_TIME is not set
+CONFIG_SUSPEND_SYNC_WORKQUEUE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_NET=y
 
@@ -938,7 +936,6 @@ CONFIG_WLAN_80211=y
 CONFIG_BCM4329=y
 # CONFIG_BCM4319 is not set
 # CONFIG_MV8686 is not set
-# CONFIG_RTL8192CU is not set
 # CONFIG_AR6003 is not set
 
 #
@@ -1328,7 +1325,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
@@ -1343,6 +1340,8 @@ CONFIG_WM831X_CHARGER_DISPLAY=y
 # CONFIG_BATTERY_BQ3060 is not set
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_GPIO is not set
+# CONFIG_BATTERY_RK29_ADC is not set
+CONFIG_POWER_ON_CHARGER_DISPLAY=y
 # CONFIG_HWMON is not set
 # CONFIG_THERMAL is not set
 # CONFIG_WATCHDOG is not set
@@ -1539,11 +1538,13 @@ CONFIG_SOC_CAMERA_OV5642=y
 CONFIG_OV5642_AUTOFOCUS=y
 # CONFIG_OV5642_FIXEDFOCUS is not set
 # CONFIG_SOC_CAMERA_OV5640 is not set
+# CONFIG_SOC_CAMERA_OV5640_FOR_TD8801 is not set
 # CONFIG_SOC_CAMERA_S5K6AA is not set
 # CONFIG_SOC_CAMERA_GT2005 is not set
 # CONFIG_SOC_CAMERA_GC0307 is not set
 # CONFIG_SOC_CAMERA_GC0308 is not set
 # CONFIG_SOC_CAMERA_GC0309 is not set
+# CONFIG_SOC_CAMERA_GC0309_FOR_TD8801 is not set
 # CONFIG_SOC_CAMERA_GC2015 is not set
 # CONFIG_SOC_CAMERA_HI253 is not set
 # CONFIG_SOC_CAMERA_HI704 is not set
@@ -1743,8 +1744,9 @@ CONFIG_DUMMY_CONSOLE=y
 CONFIG_LOGO=y
 # CONFIG_LOGO_LINUX_MONO is not set
 # CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_LOGO_LINUX_CLUT224=y
-CONFIG_LOGO_CHARGER_CLUT224=y
+# CONFIG_LOGO_LINUX_CLUT224 is not set
+# CONFIG_LOGO_CHARGER_CLUT224 is not set
+CONFIG_LOGO_G3_CLUT224=y
 CONFIG_SOUND=y
 # CONFIG_SOUND_OSS_CORE is not set
 CONFIG_SND=y
@@ -2109,6 +2111,7 @@ CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
 CONFIG_RTC_INTF_ALARM=y
 CONFIG_RTC_INTF_ALARM_DEV=y
+# CONFIG_AUTO_WAKE_UP is not set
 # CONFIG_RTC_DRV_TEST is not set
 
 #
@@ -2596,6 +2599,7 @@ CONFIG_ZLIB_DEFLATE=y
 # CONFIG_XZ_DEC is not set
 # CONFIG_XZ_DEC_BCJ is not set
 CONFIG_DECOMPRESS_GZIP=y
+CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_REED_SOLOMON=y
 CONFIG_REED_SOLOMON_ENC8=y
 CONFIG_REED_SOLOMON_DEC8=y