Merge remote-tracking branch 'usb-chipidea-next/ci-for-usb-next'

diff --git a/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt b/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt
index 781296bfbe4faacc951feb2756fb4232a0f8027c..1e8350987ad8fc4ee3ba2d7987910b738f90279e 100644 (file)
--- a/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt
+++ b/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt
@@ -2,7 +2,14 @@
 
 Required properties:
 - compatible: should be one of:
+       "fsl,imx23-usb"
        "fsl,imx27-usb"
+       "fsl,imx28-usb"
+       "fsl,imx6q-usb"
+       "fsl,imx6sl-usb"
+       "fsl,imx6sx-usb"
+       "fsl,imx6ul-usb"
+       "fsl,imx7d-usb"
        "lsi,zevio-usb"
        "qcom,ci-hdrc"
        "chipidea,usb2"

diff --git a/drivers/usb/chipidea/ci_hdrc_imx.c b/drivers/usb/chipidea/ci_hdrc_imx.c
index f14f4ab47ebb8f73268edc0530728ebe67f244c7..b4605dd14d1509e027341994f73032af1917dd3a 100644 (file)
--- a/drivers/usb/chipidea/ci_hdrc_imx.c
+++ b/drivers/usb/chipidea/ci_hdrc_imx.c
@@ -28,6 +28,11 @@ struct ci_hdrc_imx_platform_flag {
        bool runtime_pm;
 };
 
+static const struct ci_hdrc_imx_platform_flag imx23_usb_data = {
+       .flags = CI_HDRC_TURN_VBUS_EARLY_ON |
+               CI_HDRC_DISABLE_STREAMING,
+};
+
 static const struct ci_hdrc_imx_platform_flag imx27_usb_data = {
                CI_HDRC_DISABLE_STREAMING,
 };
@@ -66,6 +71,7 @@ static const struct ci_hdrc_imx_platform_flag imx7d_usb_data = {
 };
 
 static const struct of_device_id ci_hdrc_imx_dt_ids[] = {
+       { .compatible = "fsl,imx23-usb", .data = &imx23_usb_data},
        { .compatible = "fsl,imx28-usb", .data = &imx28_usb_data},
        { .compatible = "fsl,imx27-usb", .data = &imx27_usb_data},
        { .compatible = "fsl,imx6q-usb", .data = &imx6q_usb_data},

diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c
index 3eafa2c9a2ba4a2fe742cce8a6ef7e0e03d14b37..00250ab38ddb21ae1106568b68ac968ecc7e9ddf 100644 (file)
--- a/drivers/usb/chipidea/udc.c
+++ b/drivers/usb/chipidea/udc.c
@@ -819,7 +819,6 @@ static int _ep_queue(struct usb_ep *ep, struct usb_request *req,
                               ci->ep0out : ci->ep0in;
                if (!list_empty(&hwep->qh.queue)) {
                        _ep_nuke(hwep);
-                       retval = -EOVERFLOW;
                        dev_warn(hwep->ci->dev, "endpoint ctrl %X nuked\n",
                                 _usb_addr(hwep));
                }