smdk4412: bulk update from i9300 update 9

Change-Id: Icd3e7b601f3f4c8b3dcf053fed5819fb7caf5296

1 files changed, 461 insertions, 94 deletions

diff --git a/drivers/misc/max77693-muic.c b/drivers/misc/max77693-muic.c
index 41008a0..9a78d76 100644
--- a/drivers/misc/max77693-muic.c
+++ b/drivers/misc/max77693-muic.c
@@ -92,6 +92,7 @@ enum {
 	ADC_DOCK_VOL_UP		= 0x0b, /* 0x01011 17.26K ohm */
 	ADC_DOCK_PLAY_PAUSE_KEY = 0x0d,
 	ADC_SMARTDOCK		= 0x10, /* 0x10000 40.2K ohm */
+	ADC_AUDIODOCK		= 0x12, /* 0x10010 64.9K ohm */
 	ADC_CEA936ATYPE1_CHG	= 0x17,	/* 0x10111 200K ohm */
 	ADC_JIG_USB_OFF		= 0x18, /* 0x11000 255K ohm */
 	ADC_JIG_USB_ON		= 0x19, /* 0x11001 301K ohm */
@@ -135,6 +136,11 @@ struct max77693_muic_info {
 	struct wake_lock muic_wake_lock;
 
 	enum cable_type_muic	cable_type;
+#if defined(CONFIG_MUIC_MAX77693_SUPPORT_SMART_DOCK) ||\
+	defined(CONFIG_MUIC_MAX77693_SUPPORT_OTG_AUDIO_DOCK)
+	struct delayed_work	dock_work;
+#endif /* CONFIG_MUIC_MAX77693_SUPPORT_SMART_DOCK ||
+	CONFIG_MUIC_MAX77693_SUPPORT_OTG_AUDIO_DOCK */
 	struct delayed_work	init_work;
 	struct delayed_work	usb_work;
 	struct delayed_work	mhl_work;
@@ -151,6 +157,10 @@ struct max77693_muic_info {
 	bool			is_otg_attach_blocked;
 #endif /* CONFIG_MACH_GC1 */
 
+#if !defined(CONFIG_MUIC_MAX77693_SUPPORT_CAR_DOCK)
+	bool			is_factory_start;
+#endif /* !CONFIG_MUIC_MAX77693_SUPPORT_CAR_DOCK */
+
 #if defined(CONFIG_MUIC_DET_JACK)
 	int			earkeypressed;
 	int			previous_earkey;
@@ -175,8 +185,8 @@ static int get_if_pmic_inifo(char *str)
 	get_option(&str, &if_muic_info);
 	switch_sel = if_muic_info & 0x0f;
 	if_pmic_rev = (if_muic_info & 0xf0) >> 4;
-	pr_info("%s: switch_sel: %x if_pmic_rev:%x\n",
-		__func__, switch_sel, if_pmic_rev);
+	pr_info("%s %s: switch_sel: %x if_pmic_rev:%x\n",
+		__FILE__, __func__, switch_sel, if_pmic_rev);
 	return if_muic_info;
 }
 __setup("pmic_info=", get_if_pmic_inifo);
@@ -441,6 +451,14 @@ static ssize_t max77693_muic_show_device(struct device *dev,
 		return sprintf(buf, "mHL\n");
 	case CABLE_TYPE_MHL_VB_MUIC:
 		return sprintf(buf, "mHL charging\n");
+	case CABLE_TYPE_SMARTDOCK_MUIC:
+		return sprintf(buf, "Smart Dock\n");
+	case CABLE_TYPE_SMARTDOCK_TA_MUIC:
+		return sprintf(buf, "Smart Dock+TA\n");
+	case CABLE_TYPE_SMARTDOCK_USB_MUIC:
+		return sprintf(buf, "Smart Dock+USB\n");
+	case CABLE_TYPE_AUDIODOCK_MUIC:
+		return sprintf(buf, "Audio Dock\n");
 	default:
 		break;
 	}
@@ -934,6 +952,49 @@ static ssize_t max77693_muic_set_otg_block(struct device *dev,
 }
 #endif /* CONFIG_MACH_GC1 */
 
+#if !defined(CONFIG_MUIC_MAX77693_SUPPORT_CAR_DOCK)
+static ssize_t max77693_muic_show_apo_factory(struct device *dev,
+					   struct device_attribute *attr,
+					   char *buf)
+{
+	struct max77693_muic_info *info = dev_get_drvdata(dev);
+	const char *mode;
+
+	/* true: Factory mode, false: not Factory mode */
+	if (info->is_factory_start)
+		mode = "FACTORY_MODE";
+	else
+		mode = "NOT_FACTORY_MODE";
+
+	pr_info("%s:%s apo factory=%s\n", DEV_NAME, __func__, mode);
+
+	return sprintf(buf, "%s\n", mode);
+}
+
+static ssize_t max77693_muic_set_apo_factory(struct device *dev,
+					  struct device_attribute *attr,
+					  const char *buf, size_t count)
+{
+	struct max77693_muic_info *info = dev_get_drvdata(dev);
+	const char *mode;
+
+	pr_info("%s:%s buf:%s\n", DEV_NAME, __func__, buf);
+
+	/* "FACTORY_START": factory mode */
+	if (!strncmp(buf, "FACTORY_START", 13)) {
+		info->is_factory_start = true;
+		mode = "FACTORY_MODE";
+	} else {
+		pr_warn("%s:%s Wrong command\n", DEV_NAME, __func__);
+		return count;
+	}
+
+	pr_info("%s:%s apo factory=%s\n", DEV_NAME, __func__, mode);
+
+	return count;
+}
+#endif /* !CONFIG_MUIC_MAX77693_SUPPORT_CAR_DOCK */
+
 #ifdef CONFIG_LTE_VIA_SWITCH
 static ssize_t max77693_muic_show_check_cpboot(struct device *dev,
 			struct device_attribute *attr, char *buf)
@@ -1002,6 +1063,11 @@ static DEVICE_ATTR(otg_block, 0664,
 		max77693_muic_show_otg_block,
 		max77693_muic_set_otg_block);
 #endif /* CONFIG_MACH_GC1 */
+#if !defined(CONFIG_MUIC_MAX77693_SUPPORT_CAR_DOCK)
+static DEVICE_ATTR(apo_factory, 0664,
+		max77693_muic_show_apo_factory,
+		max77693_muic_set_apo_factory);
+#endif /* !CONFIG_MUIC_MAX77693_SUPPORT_CAR_DOCK */
 #ifdef CONFIG_LTE_VIA_SWITCH
 static DEVICE_ATTR(check_cpboot, 0664,
 		max77693_muic_show_check_cpboot,
@@ -1020,6 +1086,9 @@ static struct attribute *max77693_muic_attributes[] = {
 #if defined(CONFIG_MACH_GC1)
 	&dev_attr_otg_block.attr,
 #endif /* CONFIG_MACH_GC1 */
+#if !defined(CONFIG_MUIC_MAX77693_SUPPORT_CAR_DOCK)
+	&dev_attr_apo_factory.attr,
+#endif /* !CONFIG_MUIC_MAX77693_SUPPORT_CAR_DOCK */
 #ifdef CONFIG_LTE_VIA_SWITCH
 	&dev_attr_check_cpboot.attr,
 #endif
@@ -1085,6 +1154,13 @@ static int max77693_muic_set_usb_path(struct max77693_muic_info *info, int path)
 			(0 << MICEN_SHIFT);
 		cntl1_msk = COMN1SW_MASK | COMP2SW_MASK | MICEN_MASK;
 		break;
+	case OPEN_USB_MODE:
+		dev_info(info->dev, "%s: OPEN_USB_MODE\n", __func__);
+		gpio_val = 0;
+		val = MAX77693_MUIC_CTRL1_BIN_0_000;
+		cntl1_val = (val << COMN1SW_SHIFT) | (val << COMP2SW_SHIFT);
+		cntl1_msk = COMN1SW_MASK | COMP2SW_MASK;
+		break;
 	default:
 		dev_warn(info->dev, "%s: invalid path(%d)\n", __func__, path);
 		return -EINVAL;
@@ -1415,6 +1491,7 @@ static int max77693_muic_attach_dock_type(struct max77693_muic_info *info,
 		if (mdata->dock_cb)
 			mdata->dock_cb(MAX77693_MUIC_DOCK_CARDOCK);
 		break;
+#if defined(CONFIG_MUIC_MAX77693_SUPPORT_SMART_DOCK)
 	case ADC_SMARTDOCK:
 		if (info->cable_type == CABLE_TYPE_SMARTDOCK_MUIC) {
 			dev_info(info->dev, "%s: duplicated(SmartDock)\n",
@@ -1423,7 +1500,17 @@ static int max77693_muic_attach_dock_type(struct max77693_muic_info *info,
 		}
 		dev_info(info->dev, "%s:SmartDock\n", __func__);
 		info->cable_type = CABLE_TYPE_SMARTDOCK_MUIC;
-		path = AP_USB_MODE;
+
+		if (info->is_usb_ready) {
+			pr_info("%s:%s usb is ready, D+,D- line(AP_USB)\n",
+				DEV_NAME, __func__);
+			path = AP_USB_MODE;
+		} else {
+			pr_info("%s:%s usb not ready yet, D+,D- line(Open)\n",
+				DEV_NAME, __func__);
+			path = OPEN_USB_MODE;
+		}
+
 		max77693_muic_set_charging_type(info, false);
 		msleep(40);
 #ifdef CONFIG_EXTCON
@@ -1436,6 +1523,36 @@ static int max77693_muic_attach_dock_type(struct max77693_muic_info *info,
 		if (mdata->dock_cb)
 			mdata->dock_cb(MAX77693_MUIC_DOCK_SMARTDOCK);
 		break;
+#endif /* CONFIG_MUIC_MAX77693_SUPPORT_SMART_DOCK */
+#if defined(CONFIG_MUIC_MAX77693_SUPPORT_OTG_AUDIO_DOCK)
+	case ADC_AUDIODOCK:
+		if (info->cable_type == CABLE_TYPE_AUDIODOCK_MUIC) {
+			pr_info("%s:%s duplicated(AudioDock)\n", DEV_NAME,
+					__func__);
+			return 0;
+		}
+		pr_info("%s:%s AudioDock\n", DEV_NAME, __func__);
+		info->cable_type = CABLE_TYPE_AUDIODOCK_MUIC;
+
+		if (info->is_usb_ready) {
+			pr_info("%s:%s usb is ready, D+,D- line(AP_USB)\n",
+				DEV_NAME, __func__);
+			path = AP_USB_MODE;
+		} else {
+			pr_info("%s:%s usb not ready yet, D+,D- line(Open)\n",
+				DEV_NAME, __func__);
+			path = OPEN_USB_MODE;
+		}
+
+		max77693_muic_set_charging_type(info, false);
+
+		if (mdata->usb_cb && info->is_usb_ready)
+			mdata->usb_cb(USB_POWERED_HOST_ATTACHED);
+
+		if (mdata->dock_cb)
+			mdata->dock_cb(MAX77693_MUIC_DOCK_AUDIODOCK);
+		break;
+#endif /* CONFIG_MUIC_MAX77693_SUPPORT_OTG_AUDIO_DOCK */
 	default:
 		dev_info(info->dev, "%s: should not reach here(0x%x)\n",
 			 __func__, adc);
@@ -1802,54 +1919,89 @@ void powered_otg_control(int enable)
 	max77693_powered_otg_control(gInfo, enable);
 }
 
-#if defined(CONFIG_MUIC_MAX77693_SUPPORT_OTG_AUDIO_DOCK)
-#define BAT_PSY_NAME	"battery"
-void max77693_muic_attach_audio_dock(void)
+#if defined(CONFIG_MUIC_MAX77693_SUPPORT_SMART_DOCK)
+static void max77693_muic_set_cddelay(struct max77693_muic_info *info)
 {
-	struct max77693_muic_info *info = gInfo;
-	struct max77693_muic_data *mdata = info->muic_data;
-	struct power_supply *psy = power_supply_get_by_name(BAT_PSY_NAME);
-	union power_supply_propval value;
+	u8 cdetctrl1;
+	int ret = 0;
 
-	switch (info->cable_type) {
-#if defined(CONFIG_MUIC_MAX77693_SUPPORT_SMART_DOCK)
-	case CABLE_TYPE_SMARTDOCK_MUIC:
-	case CABLE_TYPE_SMARTDOCK_TA_MUIC:
-	case CABLE_TYPE_SMARTDOCK_USB_MUIC:
-		pr_info("%s:%s= SmartDock connected, ignore.\n", __FILE__,
+	ret = max77693_read_reg(info->max77693->muic,
+		MAX77693_MUIC_REG_CDETCTRL1, &cdetctrl1);
+
+	pr_info("%s:%s read CDETCTRL1=0x%x, ret=%d\n", DEV_NAME, __func__,
+			cdetctrl1, ret);
+
+	if ((cdetctrl1 & 0x10) == 0x10) {
+		pr_info("%s:%s CDDelay already setted, return\n", DEV_NAME,
 				__func__);
 		return;
-#endif /* CONFIG_MUIC_MAX77693_SUPPORT_SMART_DOCK */
-	default:
-		break;
 	}
 
-	dev_info(info->dev, "%s:AudioDock\n", __func__);
+	cdetctrl1 |= 0x10;
 
-	info->cable_type = CABLE_TYPE_AUDIODOCK_MUIC;
+	ret = max77693_write_reg(info->max77693->muic,
+		MAX77693_MUIC_REG_CDETCTRL1, cdetctrl1);
 
-	max77693_otg_control(info, 0);
+	pr_info("%s:%s write CDETCTRL1=0x%x, ret=%d\n", DEV_NAME,
+			__func__, cdetctrl1, ret);
+}
 
-	if (mdata->dock_cb)
-		mdata->dock_cb(MAX77693_MUIC_DOCK_AUDIODOCK);
+static void max77693_muic_clear_cddelay(struct max77693_muic_info *info)
+{
+	u8 cdetctrl1;
+	int ret = 0;
+
+	ret = max77693_read_reg(info->max77693->muic,
+		MAX77693_MUIC_REG_CDETCTRL1, &cdetctrl1);
+
+	pr_info("%s:%s read CDETCTRL1=0x%x, ret=%d\n", DEV_NAME, __func__,
+			cdetctrl1, ret);
 
-	if (!psy || !psy->set_property) {
-		pr_err("%s: fail to get %s psy\n", __func__, BAT_PSY_NAME);
+	if ((cdetctrl1 & 0x10) == 0x0) {
+		pr_info("%s:%s CDDelay already cleared, return\n", DEV_NAME,
+				__func__);
 		return;
 	}
 
-	psy->set_property(psy, POWER_SUPPLY_PROP_STATUS, &value);
+	cdetctrl1 &= ~(0x10);
+
+	ret = max77693_write_reg(info->max77693->muic,
+		MAX77693_MUIC_REG_CDETCTRL1, cdetctrl1);
+
+	pr_info("%s:%s write CDETCTRL1=0x%x, ret=%d\n", DEV_NAME,
+			__func__, cdetctrl1, ret);
 }
-#endif /* CONFIG_MUIC_MAX77693_SUPPORT_OTG_AUDIO_DOCK */
 
-#if defined(CONFIG_MUIC_MAX77693_SUPPORT_SMART_DOCK)
 static void max77693_muic_detach_smart_dock(struct max77693_muic_info *info)
 {
 	struct max77693_muic_data *mdata = info->muic_data;
+	enum cable_type_muic tmp_cable_type = info->cable_type;
 
 	pr_info("%s:%s\n", DEV_NAME, __func__);
 
-	switch (info->cable_type) {
+	if (info->cable_type != CABLE_TYPE_SMARTDOCK_MUIC &&
+			info->cable_type != CABLE_TYPE_SMARTDOCK_TA_MUIC &&
+			info->cable_type != CABLE_TYPE_SMARTDOCK_USB_MUIC) {
+		pr_info("%s:%s cable_type is not SMARTDOCK\n", DEV_NAME,
+				__func__);
+		return;
+	}
+
+	if (mdata->dock_cb)
+		mdata->dock_cb(MAX77693_MUIC_DOCK_DETACHED);
+
+	info->cable_type = CABLE_TYPE_NONE_MUIC;
+
+	max77693_muic_set_charging_type(info, false);
+#ifdef CONFIG_EXTCON
+	if (info->edev && info->is_mhl_ready)
+		extcon_set_cable_state(info->edev, "MHL", false);
+#else
+	if (mdata->mhl_cb && info->is_mhl_ready)
+		mdata->mhl_cb(MAX77693_MUIC_DETACHED);
+#endif
+
+	switch (tmp_cable_type) {
 	case CABLE_TYPE_SMARTDOCK_TA_MUIC:
 		pr_info("%s:%s SMARTDOCK+TA\n", DEV_NAME, __func__);
 
@@ -1863,29 +2015,16 @@ static void max77693_muic_detach_smart_dock(struct max77693_muic_info *info)
 			mdata->usb_cb(USB_CABLE_DETACHED);
 		break;
 	case CABLE_TYPE_SMARTDOCK_MUIC:
+		/* clear CDDelay 500ms */
+		max77693_muic_clear_cddelay(info);
 		pr_info("%s:%s SMARTDOCK\n", DEV_NAME, __func__);
 		break;
 	default:
-		pr_info("%s:%s cable_type is not SMARTDOCK\n", DEV_NAME,
+		pr_warn("%s:%s should not reach here!\n", DEV_NAME,
 				__func__);
 		return;
 		break;
 	}
-
-	info->cable_type = CABLE_TYPE_NONE_MUIC;
-
-	if (mdata->dock_cb) {
-		mdata->dock_cb(MAX77693_MUIC_DOCK_DETACHED);
-		msleep(20);
-	}
-	max77693_muic_set_charging_type(info, false);
-#ifdef CONFIG_EXTCON
-	if (info->edev && info->is_mhl_ready)
-		extcon_set_cable_state(info->edev, "MHL", false);
-#else
-	if (mdata->mhl_cb && info->is_mhl_ready)
-		mdata->mhl_cb(MAX77693_MUIC_DETACHED);
-#endif
 }
 
 static void max77693_muic_attach_smart_dock(struct max77693_muic_info *info,
@@ -1896,6 +2035,8 @@ static void max77693_muic_attach_smart_dock(struct max77693_muic_info *info,
 	switch (info->cable_type) {
 	case CABLE_TYPE_SMARTDOCK_MUIC:
 		if (chgtyp == CHGTYP_DEDICATED_CHGR) {
+			/* clear CDDelay 500ms */
+			max77693_muic_clear_cddelay(info);
 			pr_info("%s:%s SMART_DOCK+TA=OTG Enable\n", DEV_NAME,
 					__func__);
 
@@ -1904,6 +2045,8 @@ static void max77693_muic_attach_smart_dock(struct max77693_muic_info *info,
 
 			info->cable_type = CABLE_TYPE_SMARTDOCK_TA_MUIC;
 		} else if (chgtyp == CHGTYP_USB) {
+			/* clear CDDelay 500ms */
+			max77693_muic_clear_cddelay(info);
 			pr_info("%s:%s SMART_DOCK+USB=USB Enable\n", DEV_NAME,
 					__func__);
 
@@ -1940,7 +2083,17 @@ static void max77693_muic_attach_smart_dock(struct max77693_muic_info *info,
 			pr_info("%s:%s SMART_DOCK+vbvolt=chgdetrun\n",
 					DEV_NAME, __func__);
 			max77693_muic_attach_dock_type(info, adc);
+			if (chgtyp == CHGTYP_DEDICATED_CHGR ||
+					chgtyp == CHGTYP_USB) {
+				pr_info("%s:%s SMART_DOCK+(TA or USB)="\
+					"Recursive call to attach oneshot\n",
+					DEV_NAME, __func__);
+				max77693_muic_attach_smart_dock(info, adc,
+						vbvolt, chgtyp);
+			}
 		} else {
+			/* set CDDelay 500ms */
+			max77693_muic_set_cddelay(info);
 			dev_warn(info->dev, "no vbus in SAMRTDOCK\n");
 		}
 		break;
@@ -1948,14 +2101,34 @@ static void max77693_muic_attach_smart_dock(struct max77693_muic_info *info,
 }
 #endif /* CONFIG_MUIC_MAX77693_SUPPORT_SMART_DOCK */
 
+#if defined(CONFIG_MUIC_MAX77693_SUPPORT_OTG_AUDIO_DOCK)
+static void max77693_muic_detach_audio_dock(struct max77693_muic_info *info)
+{
+	struct max77693_muic_data *mdata = info->muic_data;
+
+	pr_info("%s:%s AUDIODOCK\n", DEV_NAME, __func__);
+
+	info->cable_type = CABLE_TYPE_NONE_MUIC;
+
+	max77693_muic_set_charging_type(info, false);
+
+	if (mdata->dock_cb)
+		mdata->dock_cb(MAX77693_MUIC_DOCK_DETACHED);
+
+	if (mdata->usb_cb && info->is_usb_ready)
+		mdata->usb_cb(USB_POWERED_HOST_DETACHED);
+}
+#endif /* CONFIG_MUIC_MAX77693_SUPPORT_OTG_AUDIO_DOCK */
+
 static int max77693_muic_handle_attach(struct max77693_muic_info *info,
 				       u8 status1, u8 status2, int irq)
 {
 	struct max77693_muic_data *mdata = info->muic_data;
-	u8 adc, vbvolt, chgtyp, chgdetrun, adc1k, dxovp;
+	u8 adc, adclow, vbvolt, chgtyp, chgdetrun, adc1k, dxovp;
 	int ret = 0;
 
 	adc = status1 & STATUS1_ADC_MASK;
+	adclow = status1 & STATUS1_ADCLOW_MASK;
 	adc1k = status1 & STATUS1_ADC1K_MASK;
 	chgtyp = status2 & STATUS2_CHGTYP_MASK;
 	vbvolt = status2 & STATUS2_VBVOLT_MASK;
@@ -1966,6 +2139,18 @@ static int max77693_muic_handle_attach(struct max77693_muic_info *info,
 		 __func__, status1, status2, info->cable_type);
 
 	switch (info->cable_type) {
+	case CABLE_TYPE_OTG_MUIC:
+		if (!!adclow) {
+			pr_warn("%s:%s assume OTG detach\n", DEV_NAME,
+					__func__);
+			info->cable_type = CABLE_TYPE_NONE_MUIC;
+
+			max77693_muic_set_charging_type(info, false);
+
+			if (mdata->usb_cb && info->is_usb_ready)
+				mdata->usb_cb(USB_OTGHOST_DETACHED);
+		}
+		break;
 	case CABLE_TYPE_JIG_UART_OFF_MUIC:
 	case CABLE_TYPE_JIG_UART_OFF_VB_MUIC:
 		/* Workaround for Factory mode.
@@ -1984,6 +2169,13 @@ static int max77693_muic_handle_attach(struct max77693_muic_info *info,
 			&& info->max77693->pmic_rev >= MAX77693_REV_PASS2)
 				max77693_muic_handle_jig_uart(info, vbvolt);
 
+#if !defined(CONFIG_MUIC_MAX77693_SUPPORT_CAR_DOCK)
+			if (info->is_factory_start) {
+				pr_info("%s:%s factory start, keep attach\n",
+						DEV_NAME, __func__);
+				break;
+			}
+#endif /* !CONFIG_MUIC_MAX77693_SUPPORT_CAR_DOCK */
 			dev_warn(info->dev, "%s: abandon ADC\n", __func__);
 			return 0;
 		}
@@ -1994,7 +2186,6 @@ static int max77693_muic_handle_attach(struct max77693_muic_info *info,
 			info->cable_type = CABLE_TYPE_NONE_MUIC;
 		}
 		break;
-
 	case CABLE_TYPE_DESKDOCK_MUIC:
 		if (adc != ADC_DESKDOCK) {
 			dev_warn(info->dev, "%s: assume deskdock detach\n",
@@ -2007,7 +2198,6 @@ static int max77693_muic_handle_attach(struct max77693_muic_info *info,
 				mdata->dock_cb(MAX77693_MUIC_DOCK_DETACHED);
 		}
 		break;
-
 	case CABLE_TYPE_CARDOCK_MUIC:
 		if (adc != ADC_CARDOCK) {
 			dev_warn(info->dev, "%s: assume cardock detach\n",
@@ -2020,6 +2210,19 @@ static int max77693_muic_handle_attach(struct max77693_muic_info *info,
 				mdata->dock_cb(MAX77693_MUIC_DOCK_DETACHED);
 		}
 		break;
+#if !defined(CONFIG_MUIC_MAX77693_SUPPORT_CAR_DOCK)
+	case CABLE_TYPE_JIG_UART_ON_MUIC:
+		if ((adc != ADC_JIG_UART_ON) &&
+			info->is_factory_start) {
+			pr_warn("%s:%s assume jig uart on detach\n",
+					DEV_NAME, __func__);
+			info->cable_type = CABLE_TYPE_NONE_MUIC;
+
+			if (mdata->dock_cb)
+				mdata->dock_cb(MAX77693_MUIC_DOCK_DETACHED);
+		}
+		break;
+#endif /* !CONFIG_MUIC_MAX77693_SUPPORT_CAR_DOCK */
 #if defined(CONFIG_MUIC_MAX77693_SUPPORT_SMART_DOCK)
 	case CABLE_TYPE_SMARTDOCK_MUIC:
 	case CABLE_TYPE_SMARTDOCK_TA_MUIC:
@@ -2029,26 +2232,21 @@ static int max77693_muic_handle_attach(struct max77693_muic_info *info,
 					__func__);
 
 			max77693_muic_detach_smart_dock(info);
+
+			info->is_adc_open_prev = false;
 		}
 		break;
 #endif /* CONFIG_MUIC_MAX77693_SUPPORT_SMART_DOCK */
+#if defined(CONFIG_MUIC_MAX77693_SUPPORT_OTG_AUDIO_DOCK)
 	case CABLE_TYPE_AUDIODOCK_MUIC:
-		if (adc != ADC_GND) {
+		if ((adc != ADC_AUDIODOCK) || (!vbvolt)) {
 			dev_warn(info->dev, "%s: assume audiodock detach\n",
 					__func__);
-			info->cable_type = CABLE_TYPE_NONE_MUIC;
-
-			max77693_muic_set_charging_type(info, false);
-			info->is_adc_open_prev = false;
 
-			if (mdata->usb_cb && info->is_usb_ready)
-				mdata->usb_cb(USB_OTGHOST_DETACHED);
-
-			if (mdata->dock_cb)
-				mdata->dock_cb(MAX77693_MUIC_DOCK_DETACHED);
+			max77693_muic_detach_audio_dock(info);
 		}
 		break;
-
+#endif /* CONFIG_MUIC_MAX77693_SUPPORT_OTG_AUDIO_DOCK */
 	default:
 		break;
 	}
@@ -2065,6 +2263,10 @@ static int max77693_muic_handle_attach(struct max77693_muic_info *info,
 				 "%s: Ignore irq:%d at MHL detection\n",
 				 __func__, irq);
 			if (vbvolt) {
+				if (info->cable_type == CABLE_TYPE_MHL_MUIC
+						&& chgtyp == CHGTYP_USB)
+					info->cable_type = CABLE_TYPE_MHL_VB_MUIC;
+
 				dev_info(info->dev, "%s: call charger_cb(%d)"
 					, __func__, vbvolt);
 				max77693_muic_set_charging_type(info, false);
@@ -2084,13 +2286,6 @@ static int max77693_muic_handle_attach(struct max77693_muic_info *info,
 	switch (adc) {
 	case ADC_GND:
 		if (chgtyp == CHGTYP_NO_VOLTAGE) {
-#if defined(CONFIG_MUIC_MAX77693_SUPPORT_OTG_AUDIO_DOCK)
-			if (info->cable_type == CABLE_TYPE_AUDIODOCK_MUIC) {
-				pr_info("%s:%s audio_dock attached, ignore\n",
-					DEV_NAME, __func__);
-				break;
-			}
-#endif /* CONFIG_MUIC_MAX77693_SUPPORT_OTG_AUDIO_DOCK */
 			if (info->cable_type == CABLE_TYPE_OTG_MUIC) {
 				dev_info(info->dev,
 					 "%s: duplicated(OTG)\n", __func__);
@@ -2116,6 +2311,12 @@ static int max77693_muic_handle_attach(struct max77693_muic_info *info,
 		max77693_muic_attach_smart_dock(info, adc, vbvolt, chgtyp);
 		break;
 #endif /* CONFIG_MUIC_MAX77693_SUPPORT_SMART_DOCK */
+#if defined(CONFIG_MUIC_MAX77693_SUPPORT_OTG_AUDIO_DOCK)
+	case ADC_AUDIODOCK:
+		if (!!vbvolt)
+			max77693_muic_attach_dock_type(info, adc);
+		break;
+#endif /* CONFIG_MUIC_MAX77693_SUPPORT_OTG_AUDIO_DOCK */
 	case ADC_JIG_UART_OFF:
 		max77693_muic_handle_jig_uart(info, vbvolt);
 #if defined(CONFIG_MACH_T0_CHN_CMCC)
@@ -2135,7 +2336,23 @@ static int max77693_muic_handle_attach(struct max77693_muic_info *info,
 		mdata->jig_state(true);
 		break;
 	case ADC_DESKDOCK:
+		max77693_muic_attach_dock_type(info, adc);
+		if (chgtyp == CHGTYP_USB ||
+			chgtyp == CHGTYP_DOWNSTREAM_PORT ||
+			chgtyp == CHGTYP_DEDICATED_CHGR ||
+			chgtyp == CHGTYP_500MA || chgtyp == CHGTYP_1A)
+			ret = max77693_muic_set_charging_type(info, false);
+		else if (chgtyp == CHGTYP_NO_VOLTAGE && !chgdetrun)
+			ret = max77693_muic_set_charging_type(info, !vbvolt);
+			/* For MAX77693 IC doesn`t occur chgtyp IRQ
+			* because of audio noise prevention.
+			* So, If below condition is set,
+			* we do charging at CARDOCK.
+			*/
+		break;
+	/* ADC_CARDOCK == ADC_JIG_UART_ON */
 	case ADC_CARDOCK:
+#if defined(CONFIG_MUIC_MAX77693_SUPPORT_CAR_DOCK)
 		max77693_muic_attach_dock_type(info, adc);
 		if (chgtyp == CHGTYP_USB ||
 			chgtyp == CHGTYP_DOWNSTREAM_PORT ||
@@ -2149,7 +2366,29 @@ static int max77693_muic_handle_attach(struct max77693_muic_info *info,
 			* So, If below condition is set,
 			* we do charging at CARDOCK.
 			*/
-			break;
+#else
+		/* because of change FACTORY CPOriented to APOriented,
+		 * at manufacture need AP wake-up method. write apo_factory
+		 * "FACTORY_START" is set is_factory_start true
+		 * and write apo_factory "FACTORY_END" is set
+		 * is_factory_start false.
+		 */
+		if (info->is_factory_start) {
+			if (info->cable_type == CABLE_TYPE_JIG_UART_ON_MUIC) {
+				pr_info("%s:%s duplicated(JIG_UART_ON)\n",
+					DEV_NAME, __func__);
+				return 0;
+			}
+			pr_info("%s:%s JIG_UART_ON\n", DEV_NAME, __func__);
+			info->cable_type = CABLE_TYPE_JIG_UART_ON_MUIC;
+
+			if (mdata->dock_cb)
+				mdata->dock_cb(MAX77693_MUIC_DOCK_DESKDOCK);
+
+			return 0;
+		}
+#endif /* CONFIG_MUIC_MAX77693_SUPPORT_CAR_DOCK */
+		break;
 #if defined(CONFIG_MUIC_DET_JACK)
 	case ADC_MHL_OR_SENDEND:
 	case ADC_DOCK_VOL_UP:
@@ -2229,14 +2468,6 @@ static int max77693_muic_handle_attach(struct max77693_muic_info *info,
 		break;
 	}
 
-#ifdef CONFIG_FAST_BOOT
-	if ((info->cable_type == CABLE_TYPE_TA_MUIC) && (fake_shut_down)) {
-		pr_info("%s: Resetting the device in fake shutdown mode"\
-			"(TA inserted !!!)\n", __func__);
-		kernel_power_off();
-	}
-#endif
-
 	return ret;
 }
 
@@ -2288,6 +2519,11 @@ static int max77693_muic_handle_detach(struct max77693_muic_info *info, int irq)
 #endif  /* CONFIG_USBHUB_USB3803 */
 	info->previous_key = DOCK_KEY_NONE;
 
+#if defined(CONFIG_MUIC_MAX77693_SUPPORT_SMART_DOCK)
+	/* clear CDDelay 500ms */
+	max77693_muic_clear_cddelay(info);
+#endif /* CONFIG_MUIC_MAX77693_SUPPORT_SMART_DOCK */
+
 	if (info->cable_type == CABLE_TYPE_NONE_MUIC) {
 		dev_info(info->dev, "%s: duplicated(NONE)\n", __func__);
 		return 0;
@@ -2305,18 +2541,6 @@ static int max77693_muic_handle_detach(struct max77693_muic_info *info, int irq)
 		if (mdata->usb_cb && info->is_usb_ready)
 			mdata->usb_cb(USB_OTGHOST_DETACHED);
 		break;
-
-	case CABLE_TYPE_AUDIODOCK_MUIC:
-		dev_info(info->dev, "%s: AUDIO\n", __func__);
-		info->cable_type = CABLE_TYPE_NONE_MUIC;
-
-		if (mdata->usb_cb && info->is_usb_ready)
-			mdata->usb_cb(USB_OTGHOST_DETACHED);
-
-		if (mdata->dock_cb)
-			mdata->dock_cb(MAX77693_MUIC_DOCK_DETACHED);
-		break;
-
 	case CABLE_TYPE_USB_MUIC:
 	case CABLE_TYPE_JIG_USB_OFF_MUIC:
 	case CABLE_TYPE_JIG_USB_ON_MUIC:
@@ -2377,8 +2601,18 @@ static int max77693_muic_handle_detach(struct max77693_muic_info *info, int irq)
 			info->cable_type = CABLE_TYPE_TA_MUIC;
 		break;
 	case CABLE_TYPE_JIG_UART_ON_MUIC:
+#if defined(CONFIG_MUIC_MAX77693_SUPPORT_CAR_DOCK)
 		dev_info(info->dev, "%s: JIG UART/BOOTON\n", __func__);
 		info->cable_type = CABLE_TYPE_NONE_MUIC;
+#else
+		if (info->is_factory_start) {
+			pr_info("%s:%s JIG_UART_ON\n", DEV_NAME, __func__);
+			info->cable_type = CABLE_TYPE_NONE_MUIC;
+
+			if (mdata->dock_cb)
+				mdata->dock_cb(MAX77693_MUIC_DOCK_DETACHED);
+		}
+#endif /* CONFIG_MUIC_MAX77693_SUPPORT_CAR_DOCK */
 		break;
 	case CABLE_TYPE_JIG_UART_OFF_MUIC:
 		dev_info(info->dev, "%s: JIG UART/BOOTOFF\n", __func__);
@@ -2391,6 +2625,11 @@ static int max77693_muic_handle_detach(struct max77693_muic_info *info, int irq)
 		max77693_muic_detach_smart_dock(info);
 		break;
 #endif /* CONFIG_MUIC_MAX77693_SUPPORT_SMART_DOCK */
+#if defined(CONFIG_MUIC_MAX77693_SUPPORT_OTG_AUDIO_DOCK)
+	case CABLE_TYPE_AUDIODOCK_MUIC:
+		max77693_muic_detach_audio_dock(info);
+		break;
+#endif /* CONFIG_MUIC_MAX77693_SUPPORT_OTG_AUDIO_DOCK */
 	case CABLE_TYPE_JIG_UART_OFF_VB_MUIC:
 		dev_info(info->dev, "%s: JIG UART/OFF/VB\n", __func__);
 		info->cable_type = CABLE_TYPE_NONE_MUIC;
@@ -2478,7 +2717,7 @@ static int max77693_muic_filter_dev(struct max77693_muic_info *info,
 	vbvolt = status2 & STATUS2_VBVOLT_MASK;
 	dxovp = status2 & STATUS2_DXOVP_MASK;
 
-	dev_info(info->dev, "adc:%x adcerr:%x chgtyp:%x vb:%x dxovp:%x cable_type:%x\n",
+	dev_info(info->dev, "adc:%x adcerr:%x chgtyp:%x vb:%x dxovp:%x cable_type:%d\n",
 		adc, adcerr, chgtyp, vbvolt, dxovp, info->cable_type);
 
 #if !defined(CONFIG_MUIC_MAX77693_SEPARATE_MHL_PORT)
@@ -2513,10 +2752,11 @@ static int max77693_muic_filter_dev(struct max77693_muic_info *info,
 	case ADC_MHL ... (ADC_SMARTDOCK - 1):
 	case (ADC_OPEN - 1):
 #endif /* !CONFIG_MUIC_DET_JACK */
-	case (ADC_SMARTDOCK + 1) ... (ADC_CEA936ATYPE1_CHG - 1):
-#if !defined(CONFIG_MUIC_MAX77693_SUPPORT_CAR_DOCK)
-	case ADC_CARDOCK:
-#endif /* CONFIG_MUIC_MAX77693_SUPPORT_CAR_DOCK */
+	case (ADC_SMARTDOCK + 1):
+#if !defined(CONFIG_MUIC_MAX77693_SUPPORT_OTG_AUDIO_DOCK)
+	case ADC_AUDIODOCK:
+#endif /* !CONFIG_MUIC_MAX77693_SUPPORT_OTG_AUDIO_DOCK */
+	case (ADC_AUDIODOCK + 1) ... (ADC_CEA936ATYPE1_CHG - 1):
 #endif /* CONFIG_MACH_GC1 */
 		dev_warn(info->dev, "%s: unsupported ADC(0x%02x)\n",
 				__func__, adc);
@@ -2682,6 +2922,87 @@ do {									\
 	}								\
 } while (0)
 
+#if defined(CONFIG_MUIC_MAX77693_SUPPORT_SMART_DOCK) ||\
+	defined(CONFIG_MUIC_MAX77693_SUPPORT_OTG_AUDIO_DOCK)
+static void max77693_muic_dock_detect(struct work_struct *work)
+{
+	struct max77693_muic_info *info =
+		container_of(work, struct max77693_muic_info, dock_work.work);
+	struct i2c_client *client = info->muic;
+	u8 status[2];
+	int ret;
+	u8 cntl1_val;
+	u8 adc, adclow, adcerr, adc1k, chgtyp, vbvolt, dxovp;
+
+	mutex_lock(&info->mutex);
+	ret = max77693_read_reg(client, MAX77693_MUIC_REG_CTRL1, &cntl1_val);
+	pr_info("%s:%s CONTROL1:%x\n", DEV_NAME, __func__, cntl1_val);
+
+	ret = max77693_bulk_read(client, MAX77693_MUIC_REG_STATUS1, 2, status);
+	if (ret) {
+		pr_err("%s:%s fail to read muic reg(%d)\n", DEV_NAME, __func__,
+			ret);
+		goto end;
+	}
+
+	pr_info("%s:%s STATUS1:0x%x, 2:0x%x\n", DEV_NAME, __func__, status[0],
+		status[1]);
+
+	adc = status[0] & STATUS1_ADC_MASK;
+	adclow = status[0] & STATUS1_ADCLOW_MASK;
+	adcerr = status[0] & STATUS1_ADCERR_MASK;
+	adc1k = status[0] & STATUS1_ADC1K_MASK;
+	chgtyp = status[1] & STATUS2_CHGTYP_MASK;
+	vbvolt = status[1] & STATUS2_VBVOLT_MASK;
+	dxovp = status[1] & STATUS2_DXOVP_MASK;
+
+	pr_info("%s:%s adc:%x adcerr:%x chgtyp:%x vb:%x dxovp:%x"\
+		" cable_type:%d\n", DEV_NAME, __func__, adc, adcerr, chgtyp,
+		vbvolt, dxovp, info->cable_type);
+
+	if (adc1k) {
+		pr_info("%s:%s MHL attached, goto end\n", DEV_NAME, __func__);
+		goto end;
+	}
+
+	if (adcerr) {
+		pr_info("%s:%s ADC error, goto end\n", DEV_NAME, __func__);
+		goto end;
+	}
+
+	switch (adc) {
+#if defined(CONFIG_MUIC_MAX77693_SUPPORT_SMART_DOCK)
+	case ADC_SMARTDOCK:
+		pr_info("%s:%s Smart Dock\n", DEV_NAME, __func__);
+
+		if (vbvolt && !info->is_usb_ready) {
+			pr_info("%s:%s usb not ready yet, D+,D- line(Open)\n",
+				DEV_NAME, __func__);
+			max77693_muic_set_usb_path(info, OPEN_USB_MODE);
+		}
+		break;
+#endif /* CONFIG_MUIC_MAX77693_SUPPORT_SMART_DOCK */
+#if defined(CONFIG_MUIC_MAX77693_SUPPORT_OTG_AUDIO_DOCK)
+	case ADC_AUDIODOCK:
+		pr_info("%s:%s Audio Dock\n", DEV_NAME, __func__);
+
+		if (vbvolt && !info->is_usb_ready) {
+			pr_info("%s:%s usb not ready yet, D+,D- line(Open)\n",
+				DEV_NAME, __func__);
+			max77693_muic_set_usb_path(info, OPEN_USB_MODE);
+		}
+		break;
+#endif /* CONFIG_MUIC_MAX77693_SUPPORT_OTG_AUDIO_DOCK */
+	default:
+		break;
+	}
+
+end:
+	mutex_unlock(&info->mutex);
+}
+#endif /* CONFIG_MUIC_MAX77693_SUPPORT_SMART_DOCK ||
+	CONFIG_MUIC_MAX77693_SUPPORT_OTG_AUDIO_DOCK */
+
 static void max77693_muic_init_detect(struct work_struct *work)
 {
 	struct max77693_muic_info *info =
@@ -2720,6 +3041,34 @@ static void max77693_muic_usb_detect(struct work_struct *work)
 				mdata->usb_cb(USB_OTGHOST_ATTACHED);
 				break;
 			case CABLE_TYPE_SMARTDOCK_MUIC:
+				pr_info("%s:%s now usb ready, turn "\
+					"D+,D- line to AP_USB\n", DEV_NAME,
+					__func__);
+				max77693_muic_set_usb_path(info, AP_USB_MODE);
+				break;
+			case CABLE_TYPE_SMARTDOCK_TA_MUIC:
+				pr_info("%s:%s now usb ready, turn "\
+					"D+,D- line to AP_USB\n", DEV_NAME,
+					__func__);
+				max77693_muic_set_usb_path(info, AP_USB_MODE);
+
+				mdata->usb_cb(USB_POWERED_HOST_ATTACHED);
+				break;
+			case CABLE_TYPE_SMARTDOCK_USB_MUIC:
+				pr_info("%s:%s now usb ready, turn "\
+					"D+,D- line to AP_USB\n", DEV_NAME,
+					__func__);
+				max77693_muic_set_usb_path(info, AP_USB_MODE);
+
+				mdata->usb_cb(USB_CABLE_ATTACHED);
+				break;
+			case CABLE_TYPE_AUDIODOCK_MUIC:
+				pr_info("%s:%s now usb ready, turn "\
+					"D+,D- line to AP_USB\n", DEV_NAME,
+					__func__);
+				max77693_muic_set_usb_path(info, AP_USB_MODE);
+
+				mdata->usb_cb(USB_POWERED_HOST_ATTACHED);
 				break;
 			default:
 				break;
@@ -2742,7 +3091,10 @@ static void max77693_muic_mhl_detect(struct work_struct *work)
 	info->is_mhl_ready = true;
 
 	if (info->cable_type == CABLE_TYPE_MHL_MUIC ||
-	    info->cable_type == CABLE_TYPE_MHL_VB_MUIC) {
+		info->cable_type == CABLE_TYPE_MHL_VB_MUIC ||
+		info->cable_type == CABLE_TYPE_SMARTDOCK_MUIC ||
+		info->cable_type == CABLE_TYPE_SMARTDOCK_TA_MUIC ||
+		info->cable_type == CABLE_TYPE_SMARTDOCK_USB_MUIC) {
 #ifdef CONFIG_EXTCON
 		if (info->edev)
 			extcon_set_cable_state(info->edev, "MHL", true);
@@ -2945,6 +3297,9 @@ static int __devinit max77693_muic_probe(struct platform_device *pdev)
 #if defined(CONFIG_MACH_GC1)
 	info->is_otg_attach_blocked = false;
 #endif /* CONFIG_MACH_GC1 */
+#if !defined(CONFIG_MUIC_MAX77693_SUPPORT_CAR_DOCK)
+	info->is_factory_start = false;
+#endif /* !CONFIG_MUIC_MAX77693_SUPPORT_CAR_DOCK */
 
 	wake_lock_init(&info->muic_wake_lock, WAKE_LOCK_SUSPEND,
 		"muic wake lock");
@@ -3102,6 +3457,13 @@ static int __devinit max77693_muic_probe(struct platform_device *pdev)
 	max77693_update_jig_state(info);
 
 	/* initial cable detection */
+#if defined(CONFIG_MUIC_MAX77693_SUPPORT_SMART_DOCK) ||\
+	defined(CONFIG_MUIC_MAX77693_SUPPORT_OTG_AUDIO_DOCK)
+	INIT_DELAYED_WORK(&info->dock_work, max77693_muic_dock_detect);
+	schedule_delayed_work(&info->dock_work, msecs_to_jiffies(50));
+#endif /* CONFIG_MUIC_MAX77693_SUPPORT_SMART_DOCK ||
+	CONFIG_MUIC_MAX77693_SUPPORT_OTG_AUDIO_DOCK */
+
 	INIT_DELAYED_WORK(&info->init_work, max77693_muic_init_detect);
 	schedule_delayed_work(&info->init_work, msecs_to_jiffies(3000));
 
@@ -3143,6 +3505,11 @@ static int __devexit max77693_muic_remove(struct platform_device *pdev)
 	if (info) {
 		dev_info(info->dev, "func:%s\n", __func__);
 		input_unregister_device(info->input);
+#if defined(CONFIG_MUIC_MAX77693_SUPPORT_SMART_DOCK) ||\
+	defined(CONFIG_MUIC_MAX77693_SUPPORT_OTG_AUDIO_DOCK)
+		cancel_delayed_work(&info->dock_work);
+#endif /* CONFIG_MUIC_MAX77693_SUPPORT_SMART_DOCK ||
+	CONFIG_MUIC_MAX77693_SUPPORT_OTG_AUDIO_DOCK */
 		cancel_delayed_work(&info->init_work);
 		cancel_delayed_work(&info->usb_work);
 		cancel_delayed_work(&info->mhl_work);