Merge tag 'usb-ci-v4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb into usb-next

Peter writes:

- Add platform interface to choose ttctrl.ttha
- Some tiny improvements

3 files changed, 12 insertions, 5 deletions

diff --git a/drivers/usb/chipidea/ci_hdrc_imx.c b/drivers/usb/chipidea/ci_hdrc_imx.c
index f14f4ab47ebb..9ce8c9f91674 100644
--- 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},
@@ -244,7 +250,6 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
         struct ci_hdrc_platform_data pdata = {
                 .name           = dev_name(&pdev->dev),
                 .capoffset      = DEF_CAPOFFSET,
-                .flags          = CI_HDRC_SET_NON_ZERO_TTHA,
         };
         int ret;
         const struct of_device_id *of_id;
@@ -302,9 +307,9 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
                                 &pdata);
         if (IS_ERR(data->ci_pdev)) {
                 ret = PTR_ERR(data->ci_pdev);
-                dev_err(&pdev->dev,
-                        "Can't register ci_hdrc platform device, err=%d\n",
-                        ret);
+                if (ret != -EPROBE_DEFER)
+                        dev_err(&pdev->dev,
+                                "ci_hdrc_add_device failed, err=%d\n", ret);
                 goto err_clk;
         }
 
diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c
index 7404064b9bbc..69426e644d17 100644
--- a/drivers/usb/chipidea/core.c
+++ b/drivers/usb/chipidea/core.c
@@ -721,6 +721,9 @@ static int ci_get_platdata(struct device *dev,
                 return ret;
         }
 
+        if (of_find_property(dev->of_node, "non-zero-ttctrl-ttha", NULL))
+                platdata->flags |= CI_HDRC_SET_NON_ZERO_TTHA;
+
         ext_id = ERR_PTR(-ENODEV);
         ext_vbus = ERR_PTR(-ENODEV);
         if (of_property_read_bool(dev->of_node, "extcon")) {
diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c
index 3eafa2c9a2ba..00250ab38ddb 100644
--- 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));
                 }