usb: dwc3: add delay p1p2p3 quirk

This patch adds delay P0 to P1/P2/P3 quirk for U2/U2/U3, and some special
platforms can configure that if it is needed.

[ balbi@ti.com : added DeviceTree binding documentation ]

Signed-off-by: Huang Rui <ray.huang@amd.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>

diff --git a/Documentation/devicetree/bindings/usb/dwc3.txt b/Documentation/devicetree/bindings/usb/dwc3.txt
index 40edc78ca602a712a770a964cac3aade13d1fb14..4c77ed6e7c073999f083d02327a8908e7fa86be2 100644 (file)
--- a/Documentation/devicetree/bindings/usb/dwc3.txt
+++ b/Documentation/devicetree/bindings/usb/dwc3.txt
@@ -22,6 +22,8 @@ Optional properties:
  - snps,u2ss_inp3_quirk: set if we enable P3 OK for U2/SS Inactive quirk
  - snps,req_p1p2p3_quirk: when set, the core will always request for
                        P1/P2/P3 transition sequence.
+ - snps,del_p1p2p3_quirk: when set core will delay P1/P2/P3 until a certain
+                       amount of 8B10B errors occur.
 
 This is usually a subnode to DWC3 glue to which it is connected.
 

diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index 600d3bc8d04d14499467c5018e0ce52a0f6e55f6..c07651484c6009f5e3824fe35f15e833f09e7827 100644 (file)
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -380,6 +380,9 @@ static void dwc3_phy_setup(struct dwc3 *dwc)
        if (dwc->req_p1p2p3_quirk)
                reg |= DWC3_GUSB3PIPECTL_REQP1P2P3;
 
+       if (dwc->del_p1p2p3_quirk)
+               reg |= DWC3_GUSB3PIPECTL_DEP1P2P3_EN;
+
        dwc3_writel(dwc->regs, DWC3_GUSB3PIPECTL(0), reg);
 
        mdelay(100);
@@ -761,6 +764,8 @@ static int dwc3_probe(struct platform_device *pdev)
                                "snps,u2ss_inp3_quirk");
                dwc->req_p1p2p3_quirk = of_property_read_bool(node,
                                "snps,req_p1p2p3_quirk");
+               dwc->del_p1p2p3_quirk = of_property_read_bool(node,
+                               "snps,del_p1p2p3_quirk");
        } else if (pdata) {
                dwc->maximum_speed = pdata->maximum_speed;
                dwc->has_lpm_erratum = pdata->has_lpm_erratum;
@@ -774,6 +779,7 @@ static int dwc3_probe(struct platform_device *pdev)
                dwc->u2exit_lfps_quirk = pdata->u2exit_lfps_quirk;
                dwc->u2ss_inp3_quirk = pdata->u2ss_inp3_quirk;
                dwc->req_p1p2p3_quirk = pdata->req_p1p2p3_quirk;
+               dwc->del_p1p2p3_quirk = pdata->del_p1p2p3_quirk;
        }
 
        /* default to superspeed if no maximum_speed passed */

diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
index ce331630fad9fdb9344d598a259b7245d95a2216..b8fbc4a1ee4a53e46f78f157a0474c2d7387dc3a 100644 (file)
--- a/drivers/usb/dwc3/core.h
+++ b/drivers/usb/dwc3/core.h
@@ -178,6 +178,9 @@
 #define DWC3_GUSB3PIPECTL_PHYSOFTRST   (1 << 31)
 #define DWC3_GUSB3PIPECTL_U2SSINP3OK   (1 << 29)
 #define DWC3_GUSB3PIPECTL_REQP1P2P3    (1 << 24)
+#define DWC3_GUSB3PIPECTL_DEP1P2P3(n)  ((n) << 19)
+#define DWC3_GUSB3PIPECTL_DEP1P2P3_MASK        DWC3_GUSB3PIPECTL_DEP1P2P3(7)
+#define DWC3_GUSB3PIPECTL_DEP1P2P3_EN  DWC3_GUSB3PIPECTL_DEP1P2P3(1)
 #define DWC3_GUSB3PIPECTL_SUSPHY       (1 << 17)
 
 /* Global TX Fifo Size Register */
@@ -685,6 +688,7 @@ struct dwc3_scratchpad_array {
  * @u2exit_lfps_quirk: set if we enable u2exit lfps quirk
  * @u2ss_inp3_quirk: set if we enable P3 OK for U2/SS Inactive quirk
  * @req_p1p2p3_quirk: set if we enable request p1p2p3 quirk
+ * @del_p1p2p3_quirk: set if we enable delay p1p2p3 quirk
  */
 struct dwc3 {
        struct usb_ctrlrequest  *ctrl_req;
@@ -796,6 +800,7 @@ struct dwc3 {
        unsigned                u2exit_lfps_quirk:1;
        unsigned                u2ss_inp3_quirk:1;
        unsigned                req_p1p2p3_quirk:1;
+       unsigned                del_p1p2p3_quirk:1;
 };
 
 /* -------------------------------------------------------------------------- */

diff --git a/drivers/usb/dwc3/platform_data.h b/drivers/usb/dwc3/platform_data.h
index d3e6ec210ef30801370d6b530d4d5bd6ee41d205..a421cecd6c16531290b0a35732b2fd7483cf3cbe 100644 (file)
--- a/drivers/usb/dwc3/platform_data.h
+++ b/drivers/usb/dwc3/platform_data.h
@@ -32,4 +32,5 @@ struct dwc3_platform_data {
        unsigned u2exit_lfps_quirk:1;
        unsigned u2ss_inp3_quirk:1;
        unsigned req_p1p2p3_quirk:1;
+       unsigned del_p1p2p3_quirk:1;
 };