From: Jonghwa Lee <jonghwa3.lee@samsung.com>
Date: Tue, 18 Mar 2014 15:41:20 +0000 (+0900)
Subject: Revert "extcon: max77693: Force using UART path for jig"
X-Git-Tag: submit/tizen_common/20140630.083047~296
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1239b2aa191a9cd5039f4013d7a10b44dd3a14c6;p=platform%2Fkernel%2Flinux-3.10.git

Revert "extcon: max77693: Force using UART path for jig"

This reverts commit ec05e8de55043b87a1dafccec5477db9a6ecf9a1.
Upcoming patch will fix a bug thus all related workaournds are now purged.

Change-Id: I52b4456867dd887c7d29a4f485c952860c6dc45c
Signed-off-by: Jonghwa Lee <jonghwa3.lee@samsung.com>
---

diff --git a/drivers/extcon/extcon-max77693.c b/drivers/extcon/extcon-max77693.c
index 903c507..3cde41b4 100644
--- a/drivers/extcon/extcon-max77693.c
+++ b/drivers/extcon/extcon-max77693.c
@@ -293,18 +293,10 @@ static int max77693_muic_set_path(struct max77693_muic_info *info,
 		return ret;
 	}
 
-	if (attached) {
-		if (info->prev_cable_type ==
-		    MAX77693_MUIC_ADC_FACTORY_MODE_UART_OFF) {
-			/* if cable_type is jig, then force UART */
-			dev_info(info->dev, "For jig force using UART path\n");
-			ctrl1 = CONTROL1_SW_UART;
-		} else {
-			ctrl1 = val;
-		}
-	} else {
+	if (attached)
+		ctrl1 = val;
+	else
 		ctrl1 = CONTROL1_SW_OPEN;
-	}
 
 	ret = max77693_update_reg(info->max77693->regmap_muic,
 			MAX77693_MUIC_REG_CTRL1, ctrl1, COMP_SW_MASK);