Zynq soc usb controller is a synopsys IP and it is compatible
with the chipidea spec. So, reusing chipidea drivers for zynq usb
controller.
Signed-off-by: Punnaiah Choudary Kalluri <[email protected]>
---
drivers/usb/chipidea/Makefile | 1 +
drivers/usb/chipidea/ci_hdrc_zynq.c | 115 +++++++++++++++++++++++++++++++++++
2 files changed, 116 insertions(+), 0 deletions(-)
create mode 100644 drivers/usb/chipidea/ci_hdrc_zynq.c
diff --git a/drivers/usb/chipidea/Makefile b/drivers/usb/chipidea/Makefile
index 2f099c7..b0d6b6f 100644
--- a/drivers/usb/chipidea/Makefile
+++ b/drivers/usb/chipidea/Makefile
@@ -12,6 +12,7 @@ ci_hdrc-$(CONFIG_USB_OTG_FSM) += otg_fsm.o
obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_msm.o
obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_zevio.o
+obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_zynq.o
# PCI doesn't provide stubs, need to check
ifneq ($(CONFIG_PCI),)
diff --git a/drivers/usb/chipidea/ci_hdrc_zynq.c b/drivers/usb/chipidea/ci_hdrc_zynq.c
new file mode 100644
index 0000000..b3667da
--- /dev/null
+++ b/drivers/usb/chipidea/ci_hdrc_zynq.c
@@ -0,0 +1,115 @@
+/*
+ * Copyright (C) 2014 Xilinx, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License version 2 as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/clk.h>
+#include <linux/dma-mapping.h>
+#include <linux/module.h>
+#include <linux/of_platform.h>
+#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
+#include <linux/usb/chipidea.h>
+
+#include "ci.h"
+
+#define ZYNQ_USB_DMA_MASK 0xFFFFFFF0
+
+struct ci_hdrc_zynq_data {
+ struct platform_device *ci_pdev;
+ struct clk *clk;
+};
+
+static struct ci_hdrc_platform_data pdata = {
+ .name = "ci_hdrc_zynq",
+ .capoffset = DEF_CAPOFFSET,
+ .flags = CI_HDRC_REQUIRE_TRANSCEIVER
+};
+
+static int ci_hdrc_zynq_probe(struct platform_device *pdev)
+{
+ struct ci_hdrc_zynq_data *data;
+ int ret;
+
+ data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
+ if (!data) {
+ dev_err(&pdev->dev, "Failed to allocate ci_hdrc-imx data!\n");
+ return -ENOMEM;
+ }
+
+ data->clk = devm_clk_get(&pdev->dev, NULL);
+ if (IS_ERR(data->clk)) {
+ dev_err(&pdev->dev,
+ "Failed to get clock, err=%ld\n", PTR_ERR(data->clk));
+ return PTR_ERR(data->clk);
+ }
+
+ ret = clk_prepare_enable(data->clk);
+ if (ret) {
+ dev_err(&pdev->dev,
+ "Failed to prepare or enable clock, err=%d\n", ret);
+ return ret;
+ }
+
+ ret = dma_coerce_mask_and_coherent(&pdev->dev, ZYNQ_USB_DMA_MASK);
+ if (ret)
+ goto err_clk;
+
+ data->ci_pdev = ci_hdrc_add_device(&pdev->dev,
+ pdev->resource, pdev->num_resources,
+ &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);
+ goto err_clk;
+ }
+
+ platform_set_drvdata(pdev, data);
+
+ pm_runtime_no_callbacks(&pdev->dev);
+ pm_runtime_enable(&pdev->dev);
+ return 0;
+
+err_clk:
+ clk_disable_unprepare(data->clk);
+ return ret;
+}
+
+static int ci_hdrc_zynq_remove(struct platform_device *pdev)
+{
+ struct ci_hdrc_zynq_data *data = platform_get_drvdata(pdev);
+
+ pm_runtime_disable(&pdev->dev);
+ ci_hdrc_remove_device(data->ci_pdev);
+ clk_disable_unprepare(data->clk);
+
+ return 0;
+}
+
+static const struct of_device_id ci_hdrc_zynq_dt_ids[] = {
+ { .compatible = "xlnx,zynq-usb-2.20a" },
+ {},
+};
+
+static struct platform_driver ci_hdrc_zynq_driver = {
+ .probe = ci_hdrc_zynq_probe,
+ .remove = ci_hdrc_zynq_remove,
+ .driver = {
+ .name = "zynq_usb",
+ .owner = THIS_MODULE,
+ .of_match_table = ci_hdrc_zynq_dt_ids,
+ },
+};
+
+module_platform_driver(ci_hdrc_zynq_driver);
+
+MODULE_ALIAS("platform:zynq_usb");
+MODULE_DESCRIPTION("CI HDRC ZYNQ USB binding");
+MODULE_AUTHOR("Xilinx Inc");
+MODULE_LICENSE("GPL v2");
--
1.7.4
On Fri, Jun 27, 2014 at 9:09 AM, Peter Chen <[email protected]> wrote:
> On Fri, Jun 27, 2014 at 09:10:09AM +0530, Punnaiah Choudary Kalluri wrote:
>> Zynq soc usb controller is a synopsys IP and it is compatible
>> with the chipidea spec. So, reusing chipidea drivers for zynq usb
>> controller.
>
> What means "... usb controller is a synopsys IP", or it should be "uses
> synopsys IP"?
Zynq soc uses synopsys usb IP. I will correct it
>>
>> Signed-off-by: Punnaiah Choudary Kalluri <[email protected]>
>> ---
>> drivers/usb/chipidea/Makefile | 1 +
>> drivers/usb/chipidea/ci_hdrc_zynq.c | 115 +++++++++++++++++++++++++++++++++++
>> 2 files changed, 116 insertions(+), 0 deletions(-)
>> create mode 100644 drivers/usb/chipidea/ci_hdrc_zynq.c
>>
>> diff --git a/drivers/usb/chipidea/Makefile b/drivers/usb/chipidea/Makefile
>> index 2f099c7..b0d6b6f 100644
>> --- a/drivers/usb/chipidea/Makefile
>> +++ b/drivers/usb/chipidea/Makefile
>> @@ -12,6 +12,7 @@ ci_hdrc-$(CONFIG_USB_OTG_FSM) += otg_fsm.o
>>
>> obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_msm.o
>> obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_zevio.o
>> +obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_zynq.o
>>
>> # PCI doesn't provide stubs, need to check
>> ifneq ($(CONFIG_PCI),)
>> diff --git a/drivers/usb/chipidea/ci_hdrc_zynq.c b/drivers/usb/chipidea/ci_hdrc_zynq.c
>> new file mode 100644
>> index 0000000..b3667da
>> --- /dev/null
>> +++ b/drivers/usb/chipidea/ci_hdrc_zynq.c
>> @@ -0,0 +1,115 @@
>> +/*
>> + * Copyright (C) 2014 Xilinx, Inc.
>> + *
>> + * This program is free software; you can redistribute it and/or modify it under
>> + * the terms of the GNU General Public License version 2 as published by the
>> + * Free Software Foundation; either version 2 of the License, or (at your
>> + * option) any later version.
>> + */
>> +
>> +#include <linux/clk.h>
>> +#include <linux/dma-mapping.h>
>> +#include <linux/module.h>
>> +#include <linux/of_platform.h>
>> +#include <linux/platform_device.h>
>> +#include <linux/pm_runtime.h>
>> +#include <linux/usb/chipidea.h>
>> +
>> +#include "ci.h"
>> +
>> +#define ZYNQ_USB_DMA_MASK 0xFFFFFFF0
>> +
>> +struct ci_hdrc_zynq_data {
>> + struct platform_device *ci_pdev;
>> + struct clk *clk;
>> +};
>> +
>> +static struct ci_hdrc_platform_data pdata = {
>> + .name = "ci_hdrc_zynq",
>> + .capoffset = DEF_CAPOFFSET,
>> + .flags = CI_HDRC_REQUIRE_TRANSCEIVER
>> +};
>> +
>> +static int ci_hdrc_zynq_probe(struct platform_device *pdev)
>> +{
>> + struct ci_hdrc_zynq_data *data;
>> + int ret;
>> +
>> + data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
>> + if (!data) {
>> + dev_err(&pdev->dev, "Failed to allocate ci_hdrc-imx data!\n");
>
> hmm, you forget to delete "xxx-imx".
Oh! i will correct it and send you the v2.
Regards,
Punnaiah
>
>> + return -ENOMEM;
>> + }
>> +
>> + data->clk = devm_clk_get(&pdev->dev, NULL);
>> + if (IS_ERR(data->clk)) {
>> + dev_err(&pdev->dev,
>> + "Failed to get clock, err=%ld\n", PTR_ERR(data->clk));
>> + return PTR_ERR(data->clk);
>> + }
>> +
>> + ret = clk_prepare_enable(data->clk);
>> + if (ret) {
>> + dev_err(&pdev->dev,
>> + "Failed to prepare or enable clock, err=%d\n", ret);
>> + return ret;
>> + }
>> +
>> + ret = dma_coerce_mask_and_coherent(&pdev->dev, ZYNQ_USB_DMA_MASK);
>> + if (ret)
>> + goto err_clk;
>> +
>> + data->ci_pdev = ci_hdrc_add_device(&pdev->dev,
>> + pdev->resource, pdev->num_resources,
>> + &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);
>> + goto err_clk;
>> + }
>> +
>> + platform_set_drvdata(pdev, data);
>> +
>> + pm_runtime_no_callbacks(&pdev->dev);
>> + pm_runtime_enable(&pdev->dev);
>> + return 0;
>> +
>> +err_clk:
>> + clk_disable_unprepare(data->clk);
>> + return ret;
>> +}
>> +
>> +static int ci_hdrc_zynq_remove(struct platform_device *pdev)
>> +{
>> + struct ci_hdrc_zynq_data *data = platform_get_drvdata(pdev);
>> +
>> + pm_runtime_disable(&pdev->dev);
>> + ci_hdrc_remove_device(data->ci_pdev);
>> + clk_disable_unprepare(data->clk);
>> +
>> + return 0;
>> +}
>> +
>> +static const struct of_device_id ci_hdrc_zynq_dt_ids[] = {
>> + { .compatible = "xlnx,zynq-usb-2.20a" },
>> + {},
>> +};
>> +
>> +static struct platform_driver ci_hdrc_zynq_driver = {
>> + .probe = ci_hdrc_zynq_probe,
>> + .remove = ci_hdrc_zynq_remove,
>> + .driver = {
>> + .name = "zynq_usb",
>> + .owner = THIS_MODULE,
>> + .of_match_table = ci_hdrc_zynq_dt_ids,
>> + },
>> +};
>> +
>> +module_platform_driver(ci_hdrc_zynq_driver);
>> +
>> +MODULE_ALIAS("platform:zynq_usb");
>> +MODULE_DESCRIPTION("CI HDRC ZYNQ USB binding");
>> +MODULE_AUTHOR("Xilinx Inc");
>> +MODULE_LICENSE("GPL v2");
>> --
>> 1.7.4
>>
>>
>
> --
>
> Best Regards,
> Peter Chen
On Fri, Jun 27, 2014 at 09:10:09AM +0530, Punnaiah Choudary Kalluri wrote:
> Zynq soc usb controller is a synopsys IP and it is compatible
> with the chipidea spec. So, reusing chipidea drivers for zynq usb
> controller.
What means "... usb controller is a synopsys IP", or it should be "uses
synopsys IP"?
>
> Signed-off-by: Punnaiah Choudary Kalluri <[email protected]>
> ---
> drivers/usb/chipidea/Makefile | 1 +
> drivers/usb/chipidea/ci_hdrc_zynq.c | 115 +++++++++++++++++++++++++++++++++++
> 2 files changed, 116 insertions(+), 0 deletions(-)
> create mode 100644 drivers/usb/chipidea/ci_hdrc_zynq.c
>
> diff --git a/drivers/usb/chipidea/Makefile b/drivers/usb/chipidea/Makefile
> index 2f099c7..b0d6b6f 100644
> --- a/drivers/usb/chipidea/Makefile
> +++ b/drivers/usb/chipidea/Makefile
> @@ -12,6 +12,7 @@ ci_hdrc-$(CONFIG_USB_OTG_FSM) += otg_fsm.o
>
> obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_msm.o
> obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_zevio.o
> +obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_zynq.o
>
> # PCI doesn't provide stubs, need to check
> ifneq ($(CONFIG_PCI),)
> diff --git a/drivers/usb/chipidea/ci_hdrc_zynq.c b/drivers/usb/chipidea/ci_hdrc_zynq.c
> new file mode 100644
> index 0000000..b3667da
> --- /dev/null
> +++ b/drivers/usb/chipidea/ci_hdrc_zynq.c
> @@ -0,0 +1,115 @@
> +/*
> + * Copyright (C) 2014 Xilinx, Inc.
> + *
> + * This program is free software; you can redistribute it and/or modify it under
> + * the terms of the GNU General Public License version 2 as published by the
> + * Free Software Foundation; either version 2 of the License, or (at your
> + * option) any later version.
> + */
> +
> +#include <linux/clk.h>
> +#include <linux/dma-mapping.h>
> +#include <linux/module.h>
> +#include <linux/of_platform.h>
> +#include <linux/platform_device.h>
> +#include <linux/pm_runtime.h>
> +#include <linux/usb/chipidea.h>
> +
> +#include "ci.h"
> +
> +#define ZYNQ_USB_DMA_MASK 0xFFFFFFF0
> +
> +struct ci_hdrc_zynq_data {
> + struct platform_device *ci_pdev;
> + struct clk *clk;
> +};
> +
> +static struct ci_hdrc_platform_data pdata = {
> + .name = "ci_hdrc_zynq",
> + .capoffset = DEF_CAPOFFSET,
> + .flags = CI_HDRC_REQUIRE_TRANSCEIVER
> +};
> +
> +static int ci_hdrc_zynq_probe(struct platform_device *pdev)
> +{
> + struct ci_hdrc_zynq_data *data;
> + int ret;
> +
> + data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
> + if (!data) {
> + dev_err(&pdev->dev, "Failed to allocate ci_hdrc-imx data!\n");
hmm, you forget to delete "xxx-imx".
> + return -ENOMEM;
> + }
> +
> + data->clk = devm_clk_get(&pdev->dev, NULL);
> + if (IS_ERR(data->clk)) {
> + dev_err(&pdev->dev,
> + "Failed to get clock, err=%ld\n", PTR_ERR(data->clk));
> + return PTR_ERR(data->clk);
> + }
> +
> + ret = clk_prepare_enable(data->clk);
> + if (ret) {
> + dev_err(&pdev->dev,
> + "Failed to prepare or enable clock, err=%d\n", ret);
> + return ret;
> + }
> +
> + ret = dma_coerce_mask_and_coherent(&pdev->dev, ZYNQ_USB_DMA_MASK);
> + if (ret)
> + goto err_clk;
> +
> + data->ci_pdev = ci_hdrc_add_device(&pdev->dev,
> + pdev->resource, pdev->num_resources,
> + &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);
> + goto err_clk;
> + }
> +
> + platform_set_drvdata(pdev, data);
> +
> + pm_runtime_no_callbacks(&pdev->dev);
> + pm_runtime_enable(&pdev->dev);
> + return 0;
> +
> +err_clk:
> + clk_disable_unprepare(data->clk);
> + return ret;
> +}
> +
> +static int ci_hdrc_zynq_remove(struct platform_device *pdev)
> +{
> + struct ci_hdrc_zynq_data *data = platform_get_drvdata(pdev);
> +
> + pm_runtime_disable(&pdev->dev);
> + ci_hdrc_remove_device(data->ci_pdev);
> + clk_disable_unprepare(data->clk);
> +
> + return 0;
> +}
> +
> +static const struct of_device_id ci_hdrc_zynq_dt_ids[] = {
> + { .compatible = "xlnx,zynq-usb-2.20a" },
> + {},
> +};
> +
> +static struct platform_driver ci_hdrc_zynq_driver = {
> + .probe = ci_hdrc_zynq_probe,
> + .remove = ci_hdrc_zynq_remove,
> + .driver = {
> + .name = "zynq_usb",
> + .owner = THIS_MODULE,
> + .of_match_table = ci_hdrc_zynq_dt_ids,
> + },
> +};
> +
> +module_platform_driver(ci_hdrc_zynq_driver);
> +
> +MODULE_ALIAS("platform:zynq_usb");
> +MODULE_DESCRIPTION("CI HDRC ZYNQ USB binding");
> +MODULE_AUTHOR("Xilinx Inc");
> +MODULE_LICENSE("GPL v2");
> --
> 1.7.4
>
>
--
Best Regards,
Peter Chen