From 9cd1c9dd57176df2418b431848177fc1db3f9323 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E9=82=B1=E5=BB=BA=E6=96=8C?= Date: Mon, 11 Apr 2011 14:36:46 +0800 Subject: [PATCH] rk29_wm8994: spk Power Amplifier Interface Change --- arch/arm/mach-rk29/board-rk29-a22.c | 2 +- arch/arm/mach-rk29/board-rk29-phonesdk.c | 2 +- drivers/headset_observe/rk2818_headset.c | 18 +++++++++--------- include/linux/mfd/wm8994/pdata.h | 4 ++-- sound/soc/codecs/wm8994.c | 12 ++++++------ 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/arch/arm/mach-rk29/board-rk29-a22.c b/arch/arm/mach-rk29/board-rk29-a22.c index 0f11599ef2d5..5127e5d4a6b5 100755 --- a/arch/arm/mach-rk29/board-rk29-a22.c +++ b/arch/arm/mach-rk29/board-rk29-a22.c @@ -1383,7 +1383,7 @@ struct wm8994_pdata wm8994_platdata = { .jd_scthr = 0, .jd_thr = 0, - .a22_ldo_enable =1, + .PA_control =1, }; //#endif diff --git a/arch/arm/mach-rk29/board-rk29-phonesdk.c b/arch/arm/mach-rk29/board-rk29-phonesdk.c index 3d7e57504b04..cc6056a68bc7 100755 --- a/arch/arm/mach-rk29/board-rk29-phonesdk.c +++ b/arch/arm/mach-rk29/board-rk29-phonesdk.c @@ -1381,7 +1381,7 @@ struct wm8994_pdata wm8994_platdata = { .jd_scthr = 0, .jd_thr = 0, - .a22_ldo_enable =0, + .PA_control =0, }; //#endif diff --git a/drivers/headset_observe/rk2818_headset.c b/drivers/headset_observe/rk2818_headset.c index 8d425fe94cee..3aefdea53a93 100755 --- a/drivers/headset_observe/rk2818_headset.c +++ b/drivers/headset_observe/rk2818_headset.c @@ -123,30 +123,30 @@ static void headsetobserve_work(struct work_struct *work) { case HEADSET_IN_HIGH: if(level > 0) - {//²åÈë--¸ßµçƽ + {//in--High level DBG("--- HEADSET_IN_HIGH headset in---\n"); Headset_dev.cur_headset_status = BIT_HEADSET; - headset_change_irqtype(IRQF_TRIGGER_FALLING);//ÉèÖÃΪϽµÑØ + headset_change_irqtype(IRQF_TRIGGER_FALLING);// } else if(level == 0) - {//°Î³ö--µÍµçƽ + {//out--Low level DBG("---HEADSET_IN_HIGH headset out---\n"); Headset_dev.cur_headset_status = ~(BIT_HEADSET|BIT_HEADSET_NO_MIC); - headset_change_irqtype(IRQF_TRIGGER_RISING);//ÉèÖÃΪÉÏÉýÑØ + headset_change_irqtype(IRQF_TRIGGER_RISING);// } break; case HEADSET_IN_LOW: if(level == 0) - {//²åÈë--µÍµçƽ + {//in--High level DBG("---HEADSET_IN_LOW headset in---\n"); Headset_dev.cur_headset_status = BIT_HEADSET; - headset_change_irqtype(IRQF_TRIGGER_RISING);//ÉèÖÃΪÉÏÉýÑØ + headset_change_irqtype(IRQF_TRIGGER_RISING);// } else if(level > 0) - {//°Î³ö--¸ßµçƽ + {//out--High level DBG("---HEADSET_IN_LOW headset out---\n"); Headset_dev.cur_headset_status = ~(BIT_HEADSET|BIT_HEADSET_NO_MIC); - headset_change_irqtype(IRQF_TRIGGER_FALLING);//ÉèÖÃΪϽµÑØ + headset_change_irqtype(IRQF_TRIGGER_FALLING);// } break; default: @@ -206,7 +206,7 @@ static int rockchip_headsetobserve_probe(struct platform_device *pdev) DBG("headsetobserve: request gpio_request failed\n"); return ret; } - gpio_pull_updown(prk2818_headset_info->gpio, GPIONormal);//²»ÉÏÀ­Ò²²»ÏÂÀ­ + gpio_pull_updown(prk2818_headset_info->gpio, GPIONormal); gpio_direction_input(prk2818_headset_info->gpio); prk2818_headset_info->irq = gpio_to_irq(prk2818_headset_info->gpio); diff --git a/include/linux/mfd/wm8994/pdata.h b/include/linux/mfd/wm8994/pdata.h index b0e4235aa4a2..dfa6ccbd45af 100755 --- a/include/linux/mfd/wm8994/pdata.h +++ b/include/linux/mfd/wm8994/pdata.h @@ -93,8 +93,8 @@ struct wm8994_pdata { unsigned int jd_scthr:2; unsigned int jd_thr:2; - //rk29-a22¹¦·Åldo =1ʹÄÜ=0²»Ê¹ÄÜ - unsigned int a22_ldo_enable:1; + //If an external amplifier speakers wm8994 enable=1 disable=0 + unsigned int PA_control:1; }; #endif diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index d9e5e7f3ff3a..d63bfdaa63d1 100755 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -3420,9 +3420,9 @@ 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 ->a22_ldo_enable == 1) + if(pdata ->PA_control == 1) { - DBG("wm8994 suspend disable a22_ldo\n"); + DBG("wm8994 suspend disable PA_control\n"); gpio_request(RK29_PIN6_PD3, NULL); //AUDIO_PA_ON gpio_direction_output(RK29_PIN6_PD3,GPIO_LOW); gpio_free(RK29_PIN6_PD3); @@ -3476,9 +3476,9 @@ static int wm8994_resume(struct platform_device *pdev) isWM8994SetChannel = false; - if(pdata ->a22_ldo_enable == 1) + if(pdata ->PA_control == 1) { - DBG("wm8994_resume enable a22_ldo\n"); + DBG("wm8994_resume 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); @@ -4030,9 +4030,9 @@ static int wm8994_probe(struct platform_device *pdev) wm8994 = codec->private_data; pdata = wm8994->pdata; - if(pdata->a22_ldo_enable == 1) + if(pdata->PA_control == 1) { - DBG("enable a22_ldo\n"); + 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); -- 2.34.1