1 files changed, 14 insertions, 0 deletions

diff --git a/drivers/usb/phy/phy-mxs-usb.c b/drivers/usb/phy/phy-mxs-usb.c
index 1b1bb0ad40c3..6fa16ab31e2e 100644
--- a/drivers/usb/phy/phy-mxs-usb.c
+++ b/drivers/usb/phy/phy-mxs-usb.c
@@ -63,6 +63,7 @@
 
 #define ANADIG_USB1_CHRG_DETECT_SET             0x1b4
 #define ANADIG_USB1_CHRG_DETECT_CLR             0x1b8
+#define ANADIG_USB2_CHRG_DETECT_SET             0x214
 #define ANADIG_USB1_CHRG_DETECT_EN_B            BIT(20)
 #define ANADIG_USB1_CHRG_DETECT_CHK_CHRG_B      BIT(19)
 #define ANADIG_USB1_CHRG_DETECT_CHK_CONTACT     BIT(18)
@@ -250,6 +251,19 @@ static int mxs_phy_hw_init(struct mxs_phy *mxs_phy)
         if (mxs_phy->data->flags & MXS_PHY_NEED_IP_FIX)
                 writel(BM_USBPHY_IP_FIX, base + HW_USBPHY_IP_SET);
 
+        if (mxs_phy->regmap_anatop) {
+                unsigned int reg = mxs_phy->port_id ?
+                        ANADIG_USB1_CHRG_DETECT_SET :
+                        ANADIG_USB2_CHRG_DETECT_SET;
+                /*
+                 * The external charger detector needs to be disabled,
+                 * or the signal at DP will be poor
+                 */
+                regmap_write(mxs_phy->regmap_anatop, reg,
+                             ANADIG_USB1_CHRG_DETECT_EN_B |
+                             ANADIG_USB1_CHRG_DETECT_CHK_CHRG_B);
+        }
+
         mxs_phy_tx_init(mxs_phy);
 
         return 0;