TD8801 : change for wm8994

diff --git a/arch/arm/configs/rk29_td8801_v2_defconfig b/arch/arm/configs/rk29_td8801_v2_defconfig
index 041677cdbea731a63fd10d9ea1b0cb965e270bd9..f6ab3eb778fa084d3f094c306a35adc1fbcd6876 100644 (file)
--- a/arch/arm/configs/rk29_td8801_v2_defconfig
+++ b/arch/arm/configs/rk29_td8801_v2_defconfig
@@ -1073,7 +1073,7 @@ CONFIG_GPIOLIB=y
 # CONFIG_GPIO_PCA953X is not set
 # CONFIG_GPIO_PCF857X is not set
 CONFIG_GPIO_WM831X=y
-
+CONFIG_GPIO_WM8994=y
 #
 # PCI GPIO expanders:
 #
@@ -1140,6 +1140,7 @@ CONFIG_MFD_CORE=y
 # CONFIG_MFD_WM8400 is not set
 CONFIG_MFD_WM831X=y
 CONFIG_MFD_WM831X_I2C=y
+CONFIG_MFD_WM8994=y
 # CONFIG_MFD_WM831X_SPI is not set
 # CONFIG_MFD_WM831X_SPI_A22 is not set
 # CONFIG_MFD_WM8350_I2C is not set
@@ -1155,6 +1156,7 @@ CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_BQ24022 is not set
 # CONFIG_REGULATOR_MAX1586 is not set
 CONFIG_REGULATOR_WM831X=y
+CONFIG_REGULATOR_WM8994=y
 # CONFIG_REGULATOR_LP3971 is not set
 # CONFIG_REGULATOR_TPS65023 is not set
 # CONFIG_REGULATOR_TPS6507X is not set

diff --git a/arch/arm/mach-rk29/board-rk29-td8801_v2.c b/arch/arm/mach-rk29/board-rk29-td8801_v2.c
index 873c402b86faf73fd26da60267d48ae01f9535c1..cd62c6c2444144236abf5a2b31c40a8a4edcfb2f 100755 (executable)
--- a/arch/arm/mach-rk29/board-rk29-td8801_v2.c
+++ b/arch/arm/mach-rk29/board-rk29-td8801_v2.c
@@ -52,8 +52,6 @@
 #include <linux/mfd/wm831x/pdata.h>
 #include <linux/mfd/wm831x/core.h>
 #include <linux/mfd/wm831x/gpio.h>
-#include <linux/mfd/wm8994/pdata.h>
-#include <linux/mfd/wm8994/registers.h>
 
 #include <linux/mtd/nand.h>
 #include <linux/mtd/partitions.h>
@@ -1581,35 +1579,6 @@ struct platform_device rk29_device_gps = {
        };
 #endif
 
-/*****************************************************************************************
- * wm8994  codec
- * author: qjb@rock-chips.com
- *****************************************************************************************/
-struct wm8994_pdata wm8994_platdata = {
-
-       .BB_input_diff = 1,
-       .BB_class = NO_PCM_BB,
-
-       .no_earpiece = 0,
-       .sp_hp_same_channel = 0,
-
-       .PA_control_pin = 0,
-       .Power_EN_Pin = RK29_PIN5_PA1,
-
-       .speaker_incall_vol = 12,
-       .speaker_incall_mic_vol = -9,
-       .speaker_normal_vol = 6,
-       .earpiece_incall_vol = 6,
-       .headset_incall_vol = 6,
-       .headset_incall_mic_vol = -6,
-       .headset_normal_vol = -6,
-       .BT_incall_vol = 0,
-       .BT_incall_mic_vol = 0,
-       .recorder_vol = 30,
-
-};
-
-
 #ifdef CONFIG_RK_HEADSET_DET
 #define HEADSET_GPIO RK29_PIN4_PD2
 struct rk_headset_pdata rk_headset_info = {
@@ -1814,9 +1783,6 @@ static struct i2c_board_info __initdata board_i2c0_devices[] = {
                .type                   = "wm8994",
                .addr           = 0x1a,
                .flags                  = 0,
-//     #if defined(CONFIG_MFD_WM8994)
-               .platform_data  = &wm8994_platdata,
-//     #endif
        },
 #endif
 #if defined (CONFIG_BATTERY_STC3100)