codec 8994

diff --git a/.config b/.config
index 305442d805ffab5ea7024ee78009b783ffee481d..f2aac12189b0bf253a7dbe0219fc54b90b8acf2d 100644 (file)
--- a/.config
+++ b/.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.32.9
-# Wed Jul  7 14:27:13 2010
+# Thu Jul 15 09:09:48 2010
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -199,7 +199,8 @@ CONFIG_ARCH_RK2818=y
 #
 # ROCKCHIP rk2818 Board Type
 #
-CONFIG_MACH_RK2818MID=y
+# CONFIG_MACH_RK2818MID is not set
+CONFIG_MACH_RK2818PHONE=y
 CONFIG_RK28_GPIO_IRQ=16
 CONFIG_RK28_ADC=y
 
@@ -866,6 +867,7 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_BATTERY_BQ27x00 is not set
 # CONFIG_BATTERY_MAX17040 is not set
 CONFIG_BATTERY_RK2818=y
+# CONFIG_PMIC_LP8725 is not set
 # CONFIG_HWMON is not set
 # CONFIG_THERMAL is not set
 # CONFIG_WATCHDOG is not set
@@ -1031,13 +1033,13 @@ CONFIG_SND_JACK=y
 CONFIG_SND_SOC=y
 CONFIG_SND_ROCKCHIP_SOC=y
 CONFIG_SND_ROCKCHIP_SOC_I2S=y
-CONFIG_SND_ROCKCHIP_SOC_WM8988=y
-# CONFIG_SND_ROCKCHIP_SOC_WM8994 is not set
-CONFIG_SND_ROCKCHIP_SOC_SLAVE=y
-# CONFIG_SND_ROCKCHIP_SOC_MASTER is not set
+# CONFIG_SND_ROCKCHIP_SOC_WM8988 is not set
+CONFIG_SND_ROCKCHIP_SOC_WM8994=y
+CONFIG_SND_CODEC_SOC_MASTER=y
+# CONFIG_SND_CODEC_SOC_SLAVE is not set
 CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_ALL_CODECS is not set
-CONFIG_SND_SOC_WM8988=y
+CONFIG_SND_SOC_WM8994=y
 # CONFIG_SOUND_PRIME is not set
 # CONFIG_HID_SUPPORT is not set
 CONFIG_HID=y

diff --git a/arch/arm/mach-rk2818/board-phonesdk.c b/arch/arm/mach-rk2818/board-phonesdk.c
index 5afd46f9c32c300f53ce542dd0afdc933eab416e..29576e350747844099f8dbddefacf19486fbd872 100644 (file)
--- a/arch/arm/mach-rk2818/board-phonesdk.c
+++ b/arch/arm/mach-rk2818/board-phonesdk.c
@@ -339,7 +339,21 @@ static struct i2c_board_info __initdata board_i2c1_devices[] = {
                .platform_data=&rk2818_pca9554_data.gpio_base,
        },
 #endif
-       {}
+#if defined (CONFIG_SND_SOC_WM8994)
+       {
+               .type                   = "wm8994",
+               .addr           = 0x1a,
+               .flags                  = 0,
+       },
+#endif
+#if defined (CONFIG_PMIC_LP8725)
+       {
+               .type                   = "lp8725",
+               .addr           = 0x79, 
+               .flags                  = 0,
+       },
+#endif
+       {},
 };