From: ChenJQ <chenjq@rock-chips.com>
Date: Wed, 1 Sep 2010 12:21:03 +0000 (-0700)
Subject: 打开18信息机的8994使能脚，关闭耳机检测部分打印，解决释放IRQ错误
X-Git-Tag: firefly_0821_release~11206
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0871799d8506a69bd6c8e56598707b297552ce01;p=firefly-linux-kernel-4.4.55.git

打开18信息机的8994使能脚，关闭耳机检测部分打印，解决释放IRQ错误
---

diff --git a/arch/arm/mach-rk2818/board-infosdk.c b/arch/arm/mach-rk2818/board-infosdk.c
index 0d756b3b9a1c..c432f6c9e8ab 100755
--- a/arch/arm/mach-rk2818/board-infosdk.c
+++ b/arch/arm/mach-rk2818/board-infosdk.c
@@ -358,6 +358,11 @@ struct rk2818_gpio_expander_info  extgpio_tca6424_settinginfo[] = {
 		.pin_type           = GPIO_OUT,
 		.pin_value			= GPIO_LOW,
 	 }, 
+	 {
+		.gpio_num    		= TCA6424_P11,
+		.pin_type           = GPIO_OUT,
+		.pin_value			= GPIO_HIGH,
+	 }, 
 	 {
 		.gpio_num    		= TCA6424_P12,
 		.pin_type           = GPIO_IN,
diff --git a/drivers/headset_observe/rk2818_headset.c b/drivers/headset_observe/rk2818_headset.c
index 2161a12954bc..8bbf1e0567e3 100644
--- a/drivers/headset_observe/rk2818_headset.c
+++ b/drivers/headset_observe/rk2818_headset.c
@@ -38,7 +38,7 @@
 #include "rk2818_headset.h"
 
 /* Debug */
-#if 1
+#if 0
 #define DBG	printk
 #else
 #define DBG
@@ -140,16 +140,12 @@ static int rockchip_headsetobserve_probe(struct platform_device *pdev)
 
 	prk2818_headset_info->irq = gpio_to_irq(prk2818_headset_info->irq);
 	headset_irq_type = prk2818_headset_info->irq_type;
-	headsetobserve_work();
-
-	if(headset_irq_type == (IRQF_TRIGGER_FALLING|IRQF_TRIGGER_RISING)){
-		free_irq(prk2818_headset_info->irq,NULL);
-		ret = request_irq(prk2818_headset_info->irq, headset_interrupt, headset_irq_type, NULL, NULL);
-		if (ret ) {
-			DBG("headsetobserve: request irq failed\n");
+	ret = request_irq(prk2818_headset_info->irq, headset_interrupt, headset_irq_type, NULL, NULL);
+	if (ret ) {
+		DBG("headsetobserve: request irq failed\n");
         	return ret;
-		}
 	}
+	headsetobserve_work();
 
 	return 0;	
 }