On Tue, Sep 30, 2014 at 08:12:07AM +0800, Peter Chen wrote:
> On Tue, Sep 23, 2014 at 12:28:03PM +0200, Antoine Tenart wrote:
> > Add a USB2 ChipIdea driver for ci13xxx, with optional PHY, clock
> > and DMA mask, to support USB2 ChipIdea controllers that don't need
> > specific functions.
> >
> > Tested on the Marvell Berlin SoCs USB controllers.
> >
> > Signed-off-by: Antoine Tenart <antoine.tenart@xxxxxxxxxxxxxxxxxx>
> > ---
> > drivers/usb/chipidea/Makefile | 1 +
> > drivers/usb/chipidea/ci_hdrc_usb2.c | 138 ++++++++++++++++++++++++++++++++++++
> > 2 files changed, 139 insertions(+)
> > create mode 100644 drivers/usb/chipidea/ci_hdrc_usb2.c
> >
> > diff --git a/drivers/usb/chipidea/Makefile b/drivers/usb/chipidea/Makefile
> > index 2f099c7df7b5..1fc86a2ca22d 100644
> > --- a/drivers/usb/chipidea/Makefile
> > +++ b/drivers/usb/chipidea/Makefile
> > @@ -10,6 +10,7 @@ ci_hdrc-$(CONFIG_USB_OTG_FSM) += otg_fsm.o
> >
> > # Glue/Bridge layers go here
> >
> > +obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_usb2.o
> > obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_msm.o
> > obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_zevio.o
> >
> > diff --git a/drivers/usb/chipidea/ci_hdrc_usb2.c b/drivers/usb/chipidea/ci_hdrc_usb2.c
> > new file mode 100644
> > index 000000000000..6eae1de587f2
> > --- /dev/null
> > +++ b/drivers/usb/chipidea/ci_hdrc_usb2.c
> > @@ -0,0 +1,138 @@
> > +/*
> > + * Copyright (C) 2014 Marvell Technology Group Ltd.
> > + *
> > + * Antoine Tenart <antoine.tenart@xxxxxxxxxxxxxxxxxx>
> > + *
> > + * This file is licensed under the terms of the GNU General Public
> > + * License version 2. This program is licensed "as is" without any
> > + * warranty of any kind, whether express or implied.
> > + */
> > +
> > +#include <linux/clk.h>
> > +#include <linux/dma-mapping.h>
> > +#include <linux/module.h>
> > +#include <linux/of.h>
> > +#include <linux/phy/phy.h>
> > +#include <linux/platform_device.h>
> > +#include <linux/usb/chipidea.h>
> > +#include <linux/usb/hcd.h>
> > +#include <linux/usb/ulpi.h>
> > +
> > +#include "ci.h"
> > +
> > +struct ci_hdrc_usb2_priv {
> > + struct platform_device *ci_pdev;
> > + struct clk *clk;
> > +};
> > +
> > +static int ci_hdrc_usb2_dt_probe(struct device *dev,
> > + struct ci_hdrc_platform_data *ci_pdata)
> > +{
> > + ci_pdata->phy = of_phy_get(dev->of_node, 0);
> > + if (IS_ERR(ci_pdata->phy)) {
> > + if (PTR_ERR(ci_pdata->phy) == -EPROBE_DEFER)
> > + return -EPROBE_DEFER;
> > +
> > + /* PHY is optional */
> > + ci_pdata->phy = NULL;
> > + }
> > +
> > + return 0;
> > +}
> > +
> > +static struct ci_hdrc_platform_data ci_default_pdata = {
> > + .capoffset = DEF_CAPOFFSET,
> > + .flags = CI_HDRC_REQUIRE_TRANSCEIVER |
> > + CI_HDRC_DISABLE_STREAMING,
> > +};
> > +
> > +static int ci_hdrc_usb2_probe(struct platform_device *pdev)
> > +{
> > + struct device *dev = &pdev->dev;
> > + struct ci_hdrc_usb2_priv *priv;
> > + struct ci_hdrc_platform_data *ci_pdata = dev_get_platdata(&pdev->dev);
> > + int ret;
> > +
> > + if (!ci_pdata)
> > + ci_pdata = &ci_default_pdata;
> > +
> > + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
> > + if (!priv)
> > + return -ENOMEM;
> > +
> > + priv->clk = devm_clk_get(dev, NULL);
> > + if (!IS_ERR(priv->clk)) {
> > + ret = clk_prepare_enable(priv->clk);
> > + if (ret) {
> > + dev_err(dev, "failed to enable the clock: %d\n", ret);
> > + return ret;
> > + }
> > + }
> > +
> > + if (dev->of_node) {
> > + ret = ci_hdrc_usb2_dt_probe(dev, ci_pdata);
> > + if (ret)
> > + goto clk_err;
> > + } else {
> > + ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
> > + if (ret)
> > + goto clk_err;
> > + }
>
Hi Antoine, if you pay attention the discussion for this patch, you should
know to do change for your next revision
- Call below unconditionally:
> > + ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
> > + if (ret)
> > + goto clk_err;
-Do not need function ci_hdrc_usb2_dt_probe, we need to cover
both dt and non-dt, but there is nothing we can to differentiate now,
The phy handle should be moved to core driver, since your generic phy
driver are still not accepted, I can't do it by myself. Either you or
I can do it after your generic phy support series has been accepted.
> > + ret = ci_hdrc_usb2_dt_probe(dev, ci_pdata);
- Others are ok
- The sequence of patch sets:
1. The generic PHY support for chipidea idea
2. Move getting PHY from individual glue layer to core driver
3. The generic chipidea driver
Peter
> > +
> > + ci_pdata->name = dev_name(&pdev->dev);
> > +
> > + priv->ci_pdev = ci_hdrc_add_device(dev, pdev->resource,
> > + pdev->num_resources, ci_pdata);
> > + if (IS_ERR(priv->ci_pdev)) {
> > + ret = PTR_ERR(priv->ci_pdev);
> > + if (ret != -EPROBE_DEFER)
> > + dev_err(dev,
> > + "failed to register ci_hdrc platform device: %d\n",
> > + ret);
> > + goto clk_err;
> > + }
> > +
> > + platform_set_drvdata(pdev, priv);
> > +
> > + pm_runtime_no_callbacks(dev);
> > + pm_runtime_enable(dev);
> > +
> > + return 0;
> > +
> > +clk_err:
> > + if (!IS_ERR(priv->clk))
> > + clk_disable_unprepare(priv->clk);
> > + return ret;
> > +}
> > +
> > +static int ci_hdrc_usb2_remove(struct platform_device *pdev)
> > +{
> > + struct ci_hdrc_usb2_priv *priv = platform_get_drvdata(pdev);
> > +
> > + pm_runtime_disable(&pdev->dev);
> > + ci_hdrc_remove_device(priv->ci_pdev);
> > + clk_disable_unprepare(priv->clk);
> > +
> > + return 0;
> > +}
> > +
> > +static const struct of_device_id ci_hdrc_usb2_of_match[] = {
> > + { .compatible = "chipidea,usb2" },
> > + { }
> > +};
> > +MODULE_DEVICE_TABLE(of, ci_hdrc_usb2_of_match);
> > +
> > +static struct platform_driver ci_hdrc_usb2_driver = {
> > + .probe = ci_hdrc_usb2_probe,
> > + .remove = ci_hdrc_usb2_remove,
> > + .driver = {
> > + .name = "chipidea-usb2",
> > + .owner = THIS_MODULE,
> > + .of_match_table = of_match_ptr(ci_hdrc_usb2_of_match),
> > + },
> > +};
> > +module_platform_driver(ci_hdrc_usb2_driver);
> > +
> > +MODULE_DESCRIPTION("ChipIdea HDRC USB2 binding for ci13xxx");
> > +MODULE_AUTHOR("Antoine Tenart <antoine.tenart@xxxxxxxxxxxxxxxxxx>");
> > +MODULE_LICENSE("GPL");
> > --
> > 1.9.1
> >
>
> --
> Best Regards,
> Peter Chen
> --
> To unsubscribe from this list: send the line "unsubscribe linux-usb" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Best Regards,
Peter Chen
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
