rk29:wm8994 fix

diff --git a/arch/arm/mach-rk29/board-rk29-a22.c b/arch/arm/mach-rk29/board-rk29-a22.c
index 5127e5d4a6b5d7410a3b3f3c0b3d9c21a84de4ec..e9207c8d3e39a4c534e2fe3aaf33789bd61fef3e 100755 (executable)
--- a/arch/arm/mach-rk29/board-rk29-a22.c
+++ b/arch/arm/mach-rk29/board-rk29-a22.c
@@ -2969,10 +2969,6 @@ static void __init machine_rk29_board_init(void)
        gpio_request(RK29_PIN5_PA1, NULL);                       
        gpio_direction_output(RK29_PIN5_PA1,GPIO_HIGH);                 
        gpio_free(RK29_PIN5_PA1);
-       
-       gpio_request(RK29_PIN6_PD3, NULL);              //AUDIO_PA_ON    
-       gpio_direction_output(RK29_PIN6_PD3,GPIO_HIGH);                 
-       gpio_free(RK29_PIN6_PD3);
 
                platform_add_devices(devices, ARRAY_SIZE(devices));
 #ifdef CONFIG_I2C0_RK29

diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index d63bfdaa63d1dbdc51bd9e8ee3aa169a52cde09b..f6d8a329453c7ffa29de8af626562d5ce63a5a0d 100755 (executable)
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -2791,6 +2791,8 @@ int snd_soc_get_route(struct snd_kcontrol *kcontrol,
 int snd_soc_put_route(struct snd_kcontrol *kcontrol,
        struct snd_ctl_elem_value *ucontrol)
 {
+       struct wm8994_priv *wm8994 = wm8994_codec->private_data;
+       struct wm8994_pdata *pdata = wm8994->pdata;
        char route = kcontrol->private_value & 0xff;
 
 #ifdef WM8994_PROC
@@ -2888,7 +2890,14 @@ int snd_soc_put_route(struct snd_kcontrol *kcontrol,
        wm8994_check_channel();
 
        isWM8994SetChannel = false;
-
+       
+       if(pdata->PA_control == 1)
+       {
+               DBG("enable PA_control\n");
+               gpio_request(RK29_PIN6_PD3, NULL);              //AUDIO_PA_ON    
+               gpio_direction_output(RK29_PIN6_PD3,GPIO_HIGH);                 
+               gpio_free(RK29_PIN6_PD3);
+       }
        return 0;
 }
 /*
@@ -3420,7 +3429,7 @@ static int wm8994_suspend(struct platform_device *pdev, pm_message_t state)
        
        isWM8994SetChannel = true;
        wm8994_set_bias_level(codec,SND_SOC_BIAS_OFF);
-       if(pdata ->PA_control == 1)
+//     if(pdata ->PA_control == 1)
        {
                DBG("wm8994 suspend disable PA_control\n");
                gpio_request(RK29_PIN6_PD3, NULL);              //AUDIO_PA_ON    
@@ -3476,7 +3485,7 @@ static int wm8994_resume(struct platform_device *pdev)
 
        isWM8994SetChannel = false;
        
-       if(pdata ->PA_control == 1)
+//     if(pdata ->PA_control == 1)
        {
                DBG("wm8994_resume enable PA_control\n");
                gpio_request(RK29_PIN6_PD3, NULL);              //AUDIO_PA_ON    
@@ -4012,8 +4021,7 @@ static int wm8994_probe(struct platform_device *pdev)
        unsigned long wm8994_port = 0;
        int ret = 0;
        char b[20];
-       struct wm8994_priv *wm8994;
-       struct wm8994_pdata *pdata;
+
 #ifdef WM8994_PROC
        wm8994_proc_init();
 #endif
@@ -4026,18 +4034,6 @@ static int wm8994_probe(struct platform_device *pdev)
        socdev->card->codec = wm8994_codec;
        codec = wm8994_codec;
        
-       recorder_and_AP_to_speakers();
-       
-       wm8994 = codec->private_data;
-       pdata = wm8994->pdata;
-       if(pdata->PA_control == 1)
-       {
-               DBG("enable PA_control\n");
-               gpio_request(RK29_PIN6_PD3, NULL);              //AUDIO_PA_ON    
-               gpio_direction_output(RK29_PIN6_PD3,GPIO_HIGH);                 
-               gpio_free(RK29_PIN6_PD3);
-       }
-       
        setup_timer(&wm8994_timer, wm8994_codec_timer, wm8994_port);
        wm8994_timer.expires  = jiffies+500;//=500ms
        add_timer(&wm8994_timer);