update rk29 phonesdk defconfig

diff --git a/arch/arm/configs/rk29_phonesdk_defconfig b/arch/arm/configs/rk29_phonesdk_defconfig
index 9de595b72c02a8d14637688c7f579f2e797f2f75..b682861206a07a4a5a536d47fe11ad0913c84f5d 100755 (executable)
--- a/arch/arm/configs/rk29_phonesdk_defconfig
+++ b/arch/arm/configs/rk29_phonesdk_defconfig
@@ -844,7 +844,7 @@ CONFIG_INPUT_WM831X_ON=y
 #
 # Magnetometer sensors
 #
-# CONFIG_COMPASS_AK8975 is not set
+CONFIG_COMPASS_AK8975=y
 # CONFIG_COMPASS_AK8973 is not set
 CONFIG_G_SENSOR_DEVICE=y
 # CONFIG_GS_MMA7660 is not set
@@ -1005,10 +1005,8 @@ CONFIG_WM831X_POWER=y
 # CONFIG_BATTERY_BQ27x00 is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_STC3100 is not set
-CONFIG_BATTERY_BQ27510=y
+# CONFIG_BATTERY_BQ27510 is not set
 # CONFIG_BATTERY_BQ3060 is not set
-# CONFIG_CHECK_BATT_CAPACITY is not set
-CONFIG_NO_BATTERY_IC=y
 # CONFIG_HWMON is not set
 # CONFIG_THERMAL is not set
 # CONFIG_WATCHDOG is not set
@@ -1595,7 +1593,7 @@ CONFIG_RTC_INTF_ALARM_DEV=y
 #
 # I2C RTC drivers
 #
-CONFIG_RTC_HYM8563=y
+# CONFIG_RTC_HYM8563 is not set
 # CONFIG_RTC_DRV_DS1307 is not set
 # CONFIG_RTC_DRV_DS1374 is not set
 # CONFIG_RTC_DRV_DS1672 is not set

diff --git a/arch/arm/mach-rk29/board-rk29-phonesdk.c b/arch/arm/mach-rk29/board-rk29-phonesdk.c
index e70e9b2e03a85782177a2ff8e2832b9805b4d335..0726161eaf6e9679cd5a38a43f89b6dd05399cb3 100755 (executable)
--- a/arch/arm/mach-rk29/board-rk29-phonesdk.c
+++ b/arch/arm/mach-rk29/board-rk29-phonesdk.c
@@ -1478,7 +1478,7 @@ static struct i2c_board_info __initdata board_i2c0_devices[] = {
 #if defined (CONFIG_SND_SOC_WM8994)
        {
                .type                   = "wm8994",
-               .addr           = 0x1A,
+               .addr           = 0x34,
                .flags                  = 0,
                .platform_data  = &wm8994_platdata,     
        },