USB: OTG: Fix PHY stuck issue in USB HOST mode
Disable PHY VBUS comparator if otg driver depends on PMIC
for VBUS and ID notifications. If enabled, VBUS comparator is
creating some noise to SESSVLD comparator and causing SESSVLD
comparator to trigger low due to which link state machine becomes
stuck as it operates solely on that value.
CRs-Fixed: 355991
Change-Id: Ieb8101f3063ebf9898da3ec9fd158c248a6cb15a
Signed-off-by: Vijayavardhan Vennapusa <vvreddy@codeaurora.org>
diff --git a/drivers/usb/otg/msm_otg.c b/drivers/usb/otg/msm_otg.c
index 2f7e250..2da48ab 100644
--- a/drivers/usb/otg/msm_otg.c
+++ b/drivers/usb/otg/msm_otg.c
@@ -537,6 +537,8 @@
ulpi_write(otg, ulpi_val, ULPI_USB_INT_EN_RISE);
ulpi_write(otg, ulpi_val, ULPI_USB_INT_EN_FALL);
} else if (pdata->otg_control == OTG_PMIC_CONTROL) {
+ ulpi_write(otg, OTG_COMP_DISABLE,
+ ULPI_SET(ULPI_PWR_CLK_MNG_REG));
/* Enable PMIC pull-up */
pm8xxx_usb_id_pullup(1);
}
@@ -776,15 +778,6 @@
ulpi_write(otg, 0x08, 0x09);
}
- /*
- * Turn off the OTG comparators, if depends on PMIC for
- * VBUS and ID notifications.
- */
- if ((motg->caps & ALLOW_PHY_COMP_DISABLE) && !host_bus_suspend) {
- ulpi_write(otg, OTG_COMP_DISABLE,
- ULPI_SET(ULPI_PWR_CLK_MNG_REG));
- motg->lpm_flags |= PHY_OTG_COMP_DISABLED;
- }
/* Set the PHCD bit, only if it is not set by the controller.
* PHY may take some time or even fail to enter into low power
@@ -958,12 +951,6 @@
}
skip_phy_resume:
- /* Turn on the OTG comparators on resume */
- if (motg->lpm_flags & PHY_OTG_COMP_DISABLED) {
- ulpi_write(otg, OTG_COMP_DISABLE,
- ULPI_CLR(ULPI_PWR_CLK_MNG_REG));
- motg->lpm_flags &= ~PHY_OTG_COMP_DISABLED;
- }
if (device_may_wakeup(otg->dev)) {
disable_irq_wake(motg->irq);
if (motg->pdata->pmic_id_irq)
@@ -1106,6 +1093,10 @@
if (on) {
dev_dbg(otg->dev, "host on\n");
+ if (pdata->otg_control == OTG_PHY_CONTROL)
+ ulpi_write(otg, OTG_COMP_DISABLE,
+ ULPI_SET(ULPI_PWR_CLK_MNG_REG));
+
/*
* Some boards have a switch cotrolled by gpio
* to enable/disable internal HUB. Enable internal
@@ -1123,6 +1114,10 @@
if (pdata->setup_gpio)
pdata->setup_gpio(OTG_STATE_UNDEFINED);
+
+ if (pdata->otg_control == OTG_PHY_CONTROL)
+ ulpi_write(otg, OTG_COMP_DISABLE,
+ ULPI_CLR(ULPI_PWR_CLK_MNG_REG));
}
}
@@ -3410,8 +3405,7 @@
(!(motg->pdata->mode == USB_OTG) ||
motg->pdata->pmic_id_irq))
motg->caps = ALLOW_PHY_POWER_COLLAPSE |
- ALLOW_PHY_RETENTION |
- ALLOW_PHY_COMP_DISABLE;
+ ALLOW_PHY_RETENTION;
if (motg->pdata->otg_control == OTG_PHY_CONTROL)
motg->caps = ALLOW_PHY_RETENTION;
diff --git a/include/linux/usb/msm_hsusb.h b/include/linux/usb/msm_hsusb.h
index e84884c..4c0ae07 100644
--- a/include/linux/usb/msm_hsusb.h
+++ b/include/linux/usb/msm_hsusb.h
@@ -338,15 +338,9 @@
* voltage regulator(VDDCX).
*/
#define ALLOW_PHY_RETENTION BIT(1)
- /*
- * Disable the OTG comparators to save more power
- * if depends on PMIC for VBUS and ID interrupts.
- */
-#define ALLOW_PHY_COMP_DISABLE BIT(2)
unsigned long lpm_flags;
#define PHY_PWR_COLLAPSED BIT(0)
#define PHY_RETENTIONED BIT(1)
-#define PHY_OTG_COMP_DISABLED BIT(2)
struct pm_qos_request_list pm_qos_req_dma;
int reset_counter;
unsigned long b_last_se0_sess;