MLK-11319-5 usb: chipidea: usbmisc_imx: add imx7d usb charger detection support
authorLi Jun <jun.li@freescale.com>
Mon, 10 Aug 2015 08:35:08 +0000 (16:35 +0800)
committerNitin Garg <nitin.garg@nxp.com>
Mon, 19 Mar 2018 19:47:19 +0000 (14:47 -0500)
Adds imx7d usb charger detection support.

Signed-off-by: Li Jun <jun.li@freescale.com>
drivers/usb/chipidea/usbmisc_imx.c

index 690b61f..052fa1f 100644 (file)
 #define VF610_OVER_CUR_DIS             BIT(7)
 
 #define MX7D_USBNC_USB_CTRL2           0x4
+#define MX7D_USBNC_USB_CTRL2_OPMODE_OVERRIDE_EN                BIT(8)
+#define MX7D_USBNC_USB_CTRL2_OPMODE_OVERRIDE_MASK      (BIT(7) | BIT(6))
+#define MX7D_USBNC_USB_CTRL2_OPMODE(v)                 (v << 6)
+#define MX7D_USBNC_USB_CTRL2_OPMODE_NON_DRIVING        MX7D_USBNC_USB_CTRL2_OPMODE(1)
+
 #define MX7D_USB_VBUS_WAKEUP_SOURCE_MASK       0x3
 #define MX7D_USB_VBUS_WAKEUP_SOURCE(v)         (v << 0)
 #define MX7D_USB_VBUS_WAKEUP_SOURCE_VBUS       MX7D_USB_VBUS_WAKEUP_SOURCE(0)
 #define MX7D_USB_VBUS_WAKEUP_SOURCE_BVALID     MX7D_USB_VBUS_WAKEUP_SOURCE(2)
 #define MX7D_USB_VBUS_WAKEUP_SOURCE_SESS_END   MX7D_USB_VBUS_WAKEUP_SOURCE(3)
 
+#define MX7D_USB_OTG_PHY_CFG2_CHRG_DCDENB      BIT(3)
+#define MX7D_USB_OTG_PHY_CFG2_CHRG_VDATSRCENB0 BIT(2)
+#define MX7D_USB_OTG_PHY_CFG2_CHRG_VDATDETENB0 BIT(1)
+#define MX7D_USB_OTG_PHY_CFG2_CHRG_CHRGSEL     BIT(0)
+#define MX7D_USB_OTG_PHY_CFG2          0x34
+
+#define MX7D_USB_OTG_PHY_STATUS                0x3c
+#define MX7D_USB_OTG_PHY_STATUS_CHRGDET                BIT(29)
+#define MX7D_USB_OTG_PHY_STATUS_VBUS_VLD       BIT(3)
+#define MX7D_USB_OTG_PHY_STATUS_LINE_STATE1    BIT(1)
+#define MX7D_USB_OTG_PHY_STATUS_LINE_STATE0    BIT(0)
+
 #define ANADIG_ANA_MISC0               0x150
 #define ANADIG_ANA_MISC0_SET           0x154
 #define ANADIG_ANA_MISC0_CLK_DELAY(x)  ((x >> 26) & 0x7)
@@ -683,6 +700,163 @@ static int usbmisc_imx6sx_power_lost_check(struct imx_usbmisc_data *data)
                return 0;
 }
 
+static void imx7_disable_charger_detector(struct imx_usbmisc_data *data)
+{
+       struct imx_usbmisc *usbmisc = dev_get_drvdata(data->dev);
+       unsigned long flags;
+       u32 val;
+
+       spin_lock_irqsave(&usbmisc->lock, flags);
+       val = readl(usbmisc->base + MX7D_USB_OTG_PHY_CFG2);
+       val &= ~(MX7D_USB_OTG_PHY_CFG2_CHRG_DCDENB |
+                       MX7D_USB_OTG_PHY_CFG2_CHRG_VDATSRCENB0 |
+                       MX7D_USB_OTG_PHY_CFG2_CHRG_VDATDETENB0 |
+                       MX7D_USB_OTG_PHY_CFG2_CHRG_CHRGSEL);
+       writel(val, usbmisc->base + MX7D_USB_OTG_PHY_CFG2);
+
+       /* Set OPMODE to be 2'b00 and disable its override */
+       val = readl(usbmisc->base + MX7D_USBNC_USB_CTRL2);
+       val &= ~MX7D_USBNC_USB_CTRL2_OPMODE_OVERRIDE_MASK;
+       writel(val, usbmisc->base + MX7D_USBNC_USB_CTRL2);
+
+       val = readl(usbmisc->base + MX7D_USBNC_USB_CTRL2);
+       writel(val & ~MX7D_USBNC_USB_CTRL2_OPMODE_OVERRIDE_EN,
+                       usbmisc->base + MX7D_USBNC_USB_CTRL2);
+       spin_unlock_irqrestore(&usbmisc->lock, flags);
+}
+
+static int imx7d_charger_data_contact_detect(struct imx_usbmisc_data *data)
+{
+       struct imx_usbmisc *usbmisc = dev_get_drvdata(data->dev);
+       struct usb_charger *charger = data->charger;
+       unsigned long flags;
+       u32 val;
+       int i, data_pin_contact_count = 0;
+
+       spin_lock_irqsave(&usbmisc->lock, flags);
+
+       /* check if vbus is valid */
+       val = readl(usbmisc->base + MX7D_USB_OTG_PHY_STATUS);
+       if (!(val & MX7D_USB_OTG_PHY_STATUS_VBUS_VLD)) {
+               dev_err(charger->dev, "vbus is error\n");
+               spin_unlock_irqrestore(&usbmisc->lock, flags);
+               return -EINVAL;
+       }
+
+       /*
+        * - Do not check whether a charger is connected to the USB port
+        * - Check whether the USB plug has been in contact with each other
+        */
+       val = readl(usbmisc->base + MX7D_USB_OTG_PHY_CFG2);
+       writel(val | MX7D_USB_OTG_PHY_CFG2_CHRG_DCDENB,
+                       usbmisc->base + MX7D_USB_OTG_PHY_CFG2);
+
+       spin_unlock_irqrestore(&usbmisc->lock, flags);
+
+       /* Check if plug is connected */
+       for (i = 0; i < 100; i = i + 1) {
+               val = readl(usbmisc->base + MX7D_USB_OTG_PHY_STATUS);
+               if (!(val & MX7D_USB_OTG_PHY_STATUS_LINE_STATE0)) {
+                       if (data_pin_contact_count++ > 5)
+                               /* Data pin makes contact */
+                               break;
+                       else
+                               usleep_range(5000, 10000);
+               } else {
+                       data_pin_contact_count = 0;
+                       usleep_range(5000, 6000);
+               }
+       }
+
+       if (i == 100) {
+               dev_err(charger->dev,
+                       "VBUS is coming from a dedicated power supply.\n");
+               imx7_disable_charger_detector(data);
+               return -ENXIO;
+       }
+
+       return 0;
+}
+
+static int imx7d_charger_primary_detection(struct imx_usbmisc_data *data)
+{
+       struct imx_usbmisc *usbmisc = dev_get_drvdata(data->dev);
+       struct usb_charger *charger = data->charger;
+       unsigned long flags;
+       u32 val;
+       int ret;
+
+       ret = imx7d_charger_data_contact_detect(data);
+       if (ret)
+               return ret;
+
+       spin_lock_irqsave(&usbmisc->lock, flags);
+       /* Set OPMODE to be non-driving mode */
+       val = readl(usbmisc->base + MX7D_USBNC_USB_CTRL2);
+       val &= ~MX7D_USBNC_USB_CTRL2_OPMODE_OVERRIDE_MASK;
+       val |= MX7D_USBNC_USB_CTRL2_OPMODE_NON_DRIVING;
+       writel(val, usbmisc->base + MX7D_USBNC_USB_CTRL2);
+
+       val = readl(usbmisc->base + MX7D_USBNC_USB_CTRL2);
+       writel(val | MX7D_USBNC_USB_CTRL2_OPMODE_OVERRIDE_EN,
+                       usbmisc->base + MX7D_USBNC_USB_CTRL2);
+
+       /*
+        * - Do check whether a charger is connected to the USB port
+        * - Do not Check whether the USB plug has been in contact with
+        * each other
+        */
+       val = readl(usbmisc->base + MX7D_USB_OTG_PHY_CFG2);
+       writel(val | MX7D_USB_OTG_PHY_CFG2_CHRG_VDATSRCENB0 |
+                       MX7D_USB_OTG_PHY_CFG2_CHRG_VDATDETENB0,
+                               usbmisc->base + MX7D_USB_OTG_PHY_CFG2);
+       spin_unlock_irqrestore(&usbmisc->lock, flags);
+
+       usleep_range(1000, 2000);
+
+       /* Check if it is a charger */
+       val = readl(usbmisc->base + MX7D_USB_OTG_PHY_STATUS);
+       if (!(val & MX7D_USB_OTG_PHY_STATUS_CHRGDET)) {
+               dev_dbg(charger->dev, "It is a stardard downstream port\n");
+               charger->psy_desc.type = POWER_SUPPLY_TYPE_USB;
+               charger->max_current = 500;
+       }
+
+       imx7_disable_charger_detector(data);
+
+       return 0;
+}
+
+/*
+ * It must be called after dp is pulled up (from USB controller driver),
+ * That is used to differentiate DCP and CDP
+ */
+int imx7d_charger_secondary_detection(struct imx_usbmisc_data *data)
+{
+       struct imx_usbmisc *usbmisc = dev_get_drvdata(data->dev);
+       struct usb_charger *charger = data->charger;
+       int val;
+
+       msleep(80);
+
+       mutex_lock(&charger->lock);
+       val = readl(usbmisc->base + MX7D_USB_OTG_PHY_STATUS);
+       if (val & MX7D_USB_OTG_PHY_STATUS_LINE_STATE1) {
+               dev_dbg(charger->dev, "It is a dedicate charging port\n");
+               charger->psy_desc.type = POWER_SUPPLY_TYPE_USB_DCP;
+               charger->max_current = 1500;
+       } else {
+               dev_dbg(charger->dev, "It is a charging downstream port\n");
+               charger->psy_desc.type = POWER_SUPPLY_TYPE_USB_CDP;
+               charger->max_current = 900;
+       }
+
+       usb_charger_is_present(charger, true);
+       mutex_unlock(&charger->lock);
+
+       return 0;
+}
+
 static const struct usbmisc_ops imx25_usbmisc_ops = {
        .init = usbmisc_imx25_init,
        .post = usbmisc_imx25_post,
@@ -723,6 +897,8 @@ static const struct usbmisc_ops imx7d_usbmisc_ops = {
        .init = usbmisc_imx7d_init,
        .set_wakeup = usbmisc_imx7d_set_wakeup,
        .power_lost_check = usbmisc_imx7d_power_lost_check,
+       .charger_primary_detection = imx7d_charger_primary_detection,
+       .charger_secondary_detection = imx7d_charger_secondary_detection,
 };
 
 int imx_usbmisc_init(struct imx_usbmisc_data *data)