shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 04:48:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

rk29:wm8994 board fix

Browse Source
This commit is contained in:
邱建斌
2011-04-11 14:08:07 +08:00
parent 0344561296
commit fed3573017
3 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-rk29/board-rk29-a22.c
View File

@@ -1382,6 +1382,8 @@ struct wm8994_pdata wm8994_platdata = {
.jd_scthr = 0,
.jd_thr = 0,
.a22_ldo_enable =1,
};
//#endif

2
arch/arm/mach-rk29/board-rk29-phonesdk.c
View File

@@ -1380,6 +1380,8 @@ struct wm8994_pdata wm8994_platdata = {
.jd_scthr = 0,
.jd_thr = 0,
.a22_ldo_enable =0,
};
//#endif

26
drivers/headset_observe/rk2818_headset.c
View File

@@ -1,4 +1,4 @@
/* arch/arm/mach-rockchip/rk28_headset.c
/* arch/arm/mach-rockchip/rk28_headset.c
*
* Copyright (C) 2009 Rockchip Corporation.
*
@@ -74,7 +74,7 @@ EXPORT_SYMBOL_GPL(headset_status);
static irqreturn_t headset_interrupt(int irq, void *dev_id)
{
DBG("---headset_interrupt---\n");
// DBG("---headset_interrupt---\n");
schedule_delayed_work(&g_headsetobserve_work, msecs_to_jiffies(20));
return IRQ_HANDLED;
}
@@ -82,7 +82,7 @@ static irqreturn_t headset_interrupt(int irq, void *dev_id)
static int headset_change_irqtype(unsigned int irq_type)
{
int ret = 0;
DBG("--------%s----------\n",__FUNCTION__);
// DBG("--------%s----------\n",__FUNCTION__);
free_irq(prk2818_headset_info->irq,NULL);
ret = request_irq(prk2818_headset_info->irq, headset_interrupt, irq_type, NULL, NULL);
@@ -98,7 +98,7 @@ static void headsetobserve_work(struct work_struct *work)
{
int i,level = 0;
DBG("---headsetobserve_work---\n");
// DBG("---headsetobserve_work---\n");
mutex_lock(&Headset_dev.mutex_lock);
for(i=0; i<3; i++)
@@ -123,30 +123,30 @@ static void headsetobserve_work(struct work_struct *work)
{
case HEADSET_IN_HIGH:
if(level > 0)
{//插入--高电平
{//<EFBFBD><EFBFBD><EFBFBD><EFBFBD>--<2D>ߵ<EFBFBD>ƽ
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);//<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ<EFBFBD>½<EFBFBD><EFBFBD><EFBFBD>
}
else if(level == 0)
{//拔出--低电平
{//<EFBFBD>γ<EFBFBD>--<2D>͵<EFBFBD>ƽ
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);//<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
}
break;
case HEADSET_IN_LOW:
if(level == 0)
{//插入--低电平
{//<EFBFBD><EFBFBD><EFBFBD><EFBFBD>--<2D>͵<EFBFBD>ƽ
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);//<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
}
else if(level > 0)
{//拔出--高电平
{//<EFBFBD>γ<EFBFBD>--<2D>ߵ<EFBFBD>ƽ
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);//<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ<EFBFBD>½<EFBFBD><EFBFBD><EFBFBD>
}
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);//<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ҳ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
gpio_direction_input(prk2818_headset_info->gpio);
prk2818_headset_info->irq = gpio_to_irq(prk2818_headset_info->gpio);