Merge branch 'master' of fossencdi.org:kernel_samsung_smdk4412

1 files changed, 31 insertions, 0 deletions

diff --git a/arch/arm/mach-exynos/mdm2.c b/arch/arm/mach-exynos/mdm2.c
index f6981ec..09b2a0f 100644
--- a/arch/arm/mach-exynos/mdm2.c
+++ b/arch/arm/mach-exynos/mdm2.c
@@ -200,6 +200,16 @@ static void mdm_do_first_power_on(struct mdm_modem_drv *mdm_drv)
 	usleep_range(10000, 15000);
 	gpio_direction_output(mdm_drv->ap2mdm_status_gpio, 1);
 
+#ifdef CONFIG_HSIC_EURONLY_APPLY
+	for (i = 0; i  < MDM_PBLRDY_CNT; i++) {
+		pblrdy = gpio_get_value(mdm_drv->mdm2ap_pblrdy);
+		if (pblrdy)
+			break;
+		usleep_range(5000, 5000);
+	}
+
+	pr_err("%s: i:%d\n", __func__, i);
+#else
 	if (!mdm_drv->mdm2ap_pblrdy)
 		goto start_mdm_peripheral;
 
@@ -211,6 +221,7 @@ static void mdm_do_first_power_on(struct mdm_modem_drv *mdm_drv)
 	}
 
 	pr_debug("%s: i:%d\n", __func__, i);
+#endif
 
 start_mdm_peripheral:
 	mdm_peripheral_connect(mdm_drv);
@@ -226,6 +237,17 @@ static void mdm_do_soft_power_on(struct mdm_modem_drv *mdm_drv)
 	mdm_peripheral_disconnect(mdm_drv);
 	mdm_toggle_soft_reset(mdm_drv);
 
+#ifdef CONFIG_HSIC_EURONLY_APPLY
+
+	for (i = 0; i  < MDM_PBLRDY_CNT; i++) {
+		pblrdy = gpio_get_value(mdm_drv->mdm2ap_pblrdy);
+		if (pblrdy)
+			break;
+		usleep_range(5000, 5000);
+	}
+
+	pr_err("%s: i:%d\n", __func__, i);
+#else
 	if (!mdm_drv->mdm2ap_pblrdy)
 		goto start_mdm_peripheral;
 
@@ -237,6 +259,7 @@ static void mdm_do_soft_power_on(struct mdm_modem_drv *mdm_drv)
 	}
 
 	pr_debug("%s: i:%d\n", __func__, i);
+#endif
 
 start_mdm_peripheral:
 	mdm_peripheral_connect(mdm_drv);
@@ -247,6 +270,14 @@ static void mdm_power_on_common(struct mdm_modem_drv *mdm_drv)
 {
 	power_on_count++;
 
+#ifdef CONFIG_HSIC_EURONLY_APPLY
+		if(0==(power_on_count%5))
+		{
+			mdm_power_down_common(mdm_drv);
+			pr_err("%s : power_on_count reset!\n", __func__);
+		}
+#endif
+
 	/* this gpio will be used to indicate apq readiness,
 	 * de-assert it now so that it can be asserted later.
 	 * May not be used.