| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <b67542c4-b314-4d8d-ad0c-fcc08da6d65b@CH1EHSMHS041.ehs.local>
Date: Sun, 20 Apr 2014 21:53:28 +0530
From: Punnaiah Choudary Kalluri <punnaiah.choudary.kalluri@...inx.com>
To: <leoli@...escale.com>, <balbi@...com>, <michal.simek@...inx.c>
CC: <linux-kernel@...r.kernel.org>, <linuxppc-dev@...ts.ozlabs.org>,
<linux-arm-kernel@...ts.infradead.org>,
<linux-usb@...r.kernel.org>,
Punnaiah Choudary Kalluri <punnaia@...inx.com>
Subject: [RFC PATCH 1/2] usb: gadget: fsl_udc: Add support for zynq usb device controller
Since zynq soc usb controller is a synopsys IP and there is a driver
available for this controller from freescale in opensource, reusing this
driver for zynq use.
Signed-off-by: Punnaiah Choudary Kalluri <punnaia@...inx.com>
---
drivers/usb/gadget/Kconfig | 2 +-
drivers/usb/gadget/Makefile | 1 +
drivers/usb/gadget/fsl_mxc_udc.c | 21 +++++++++++++++++++++
drivers/usb/gadget/fsl_udc_core.c | 5 +++++
drivers/usb/gadget/fsl_usb2_udc.h | 2 +-
drivers/usb/host/fsl-mph-dr-of.c | 9 +++++++++
6 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 3557c7e..7f18ab47 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -186,7 +186,7 @@ config USB_BCM63XX_UDC
config USB_FSL_USB2
tristate "Freescale Highspeed USB DR Peripheral Controller"
- depends on FSL_SOC || ARCH_MXC
+ depends on FSL_SOC || ARCH_MXC || ARCH_ZYNQ
select USB_FSL_MPH_DR_OF if OF
help
Some of Freescale PowerPC and i.MX processors have a High Speed
diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
index 5f150bc..38b009f 100644
--- a/drivers/usb/gadget/Makefile
+++ b/drivers/usb/gadget/Makefile
@@ -23,6 +23,7 @@ obj-$(CONFIG_USB_BCM63XX_UDC) += bcm63xx_udc.o
obj-$(CONFIG_USB_FSL_USB2) += fsl_usb2_udc.o
fsl_usb2_udc-y := fsl_udc_core.o
fsl_usb2_udc-$(CONFIG_ARCH_MXC) += fsl_mxc_udc.o
+fsl_usb2_udc-$(CONFIG_ARCH_ZYNQ) += fsl_mxc_udc.o
obj-$(CONFIG_USB_M66592) += m66592-udc.o
obj-$(CONFIG_USB_R8A66597) += r8a66597-udc.o
obj-$(CONFIG_USB_FSL_QE) += fsl_qe_udc.o
diff --git a/drivers/usb/gadget/fsl_mxc_udc.c b/drivers/usb/gadget/fsl_mxc_udc.c
index 9b140fc..181245c 100644
--- a/drivers/usb/gadget/fsl_mxc_udc.c
+++ b/drivers/usb/gadget/fsl_mxc_udc.c
@@ -19,8 +19,10 @@
#include <linux/io.h>
static struct clk *mxc_ahb_clk;
+#ifndef CONFIG_ARCH_ZYNQ
static struct clk *mxc_per_clk;
static struct clk *mxc_ipg_clk;
+#endif
/* workaround ENGcm09152 for i.MX35 */
#define MX35_USBPHYCTRL_OFFSET 0x600
@@ -30,6 +32,7 @@ static struct clk *mxc_ipg_clk;
int fsl_udc_clk_init(struct platform_device *pdev)
{
struct fsl_usb2_platform_data *pdata;
+#ifndef CONFIG_ARCH_ZYNQ
unsigned long freq;
int ret;
@@ -76,10 +79,21 @@ eclkrate:
clk_disable_unprepare(mxc_per_clk);
mxc_per_clk = NULL;
return ret;
+#else
+ pdata = dev_get_platdata(&pdev->dev);
+ mxc_ahb_clk = devm_clk_get(pdev->dev.parent, NULL);
+ if (IS_ERR(mxc_ahb_clk))
+ return PTR_ERR(mxc_ahb_clk);
+
+ clk_prepare_enable(mxc_ahb_clk);
+
+ return 0;
+#endif
}
int fsl_udc_clk_finalize(struct platform_device *pdev)
{
+#ifndef CONFIG_ARCH_ZYNQ
struct fsl_usb2_platform_data *pdata = dev_get_platdata(&pdev->dev);
int ret = 0;
@@ -112,12 +126,19 @@ ioremap_err:
}
return ret;
+#else
+ return 0;
+#endif
}
void fsl_udc_clk_release(void)
{
+#ifndef CONFIG_ARCH_ZYNQ
if (mxc_per_clk)
clk_disable_unprepare(mxc_per_clk);
clk_disable_unprepare(mxc_ahb_clk);
clk_disable_unprepare(mxc_ipg_clk);
+#else
+ clk_disable_unprepare(mxc_ahb_clk);
+#endif
}
diff --git a/drivers/usb/gadget/fsl_udc_core.c b/drivers/usb/gadget/fsl_udc_core.c
index 15960af..c3ff3fb 100644
--- a/drivers/usb/gadget/fsl_udc_core.c
+++ b/drivers/usb/gadget/fsl_udc_core.c
@@ -2492,6 +2492,9 @@ static int __init fsl_udc_probe(struct platform_device *pdev)
goto err_free_irq;
}
+#ifdef CONFIG_ARCH_ZYNQ
+ udc_controller->vbus_active = 1;
+#endif
ret = usb_add_gadget_udc_release(&pdev->dev, &udc_controller->gadget,
fsl_udc_release);
if (ret)
@@ -2661,8 +2664,10 @@ static const struct platform_device_id fsl_udc_devtype[] = {
MODULE_DEVICE_TABLE(platform, fsl_udc_devtype);
static struct platform_driver udc_driver = {
.remove = __exit_p(fsl_udc_remove),
+#ifndef CONFIG_ARCH_ZYNQ
/* Just for FSL i.mx SoC currently */
.id_table = fsl_udc_devtype,
+#endif
/* these suspend and resume are not usb suspend and resume */
.suspend = fsl_udc_suspend,
.resume = fsl_udc_resume,
diff --git a/drivers/usb/gadget/fsl_usb2_udc.h b/drivers/usb/gadget/fsl_usb2_udc.h
index c6703bb..6394138 100644
--- a/drivers/usb/gadget/fsl_usb2_udc.h
+++ b/drivers/usb/gadget/fsl_usb2_udc.h
@@ -590,7 +590,7 @@ static inline struct ep_queue_head *get_qh_by_ep(struct fsl_ep *ep)
}
struct platform_device;
-#ifdef CONFIG_ARCH_MXC
+#if defined CONFIG_ARCH_MXC || defined CONFIG_ARCH_ZYNQ
int fsl_udc_clk_init(struct platform_device *pdev);
int fsl_udc_clk_finalize(struct platform_device *pdev);
void fsl_udc_clk_release(void);
diff --git a/drivers/usb/host/fsl-mph-dr-of.c b/drivers/usb/host/fsl-mph-dr-of.c
index 9162d1b..7d89415 100644
--- a/drivers/usb/host/fsl-mph-dr-of.c
+++ b/drivers/usb/host/fsl-mph-dr-of.c
@@ -42,6 +42,10 @@ static struct fsl_usb2_dev_data dr_mode_data[] = {
},
};
+#ifdef CONFIG_ARCH_ZYNQ
+static u64 dma_mask = 0xFFFFFFF0;
+#endif
+
static struct fsl_usb2_dev_data *get_dr_mode_data(struct device_node *np)
{
const unsigned char *prop;
@@ -94,7 +98,11 @@ static struct platform_device *fsl_usb2_device_register(
pdev->dev.parent = &ofdev->dev;
pdev->dev.coherent_dma_mask = ofdev->dev.coherent_dma_mask;
+#ifndef CONFIG_ARCH_ZYNQ
*pdev->dev.dma_mask = *ofdev->dev.dma_mask;
+#else
+ pdev->dev.dma_mask = &dma_mask;
+#endif
retval = platform_device_add_data(pdev, pdata, sizeof(*pdata));
if (retval)
@@ -320,6 +328,7 @@ static const struct of_device_id fsl_usb2_mph_dr_of_match[] = {
#ifdef CONFIG_PPC_MPC512x
{ .compatible = "fsl,mpc5121-usb2-dr", .data = &fsl_usb2_mpc5121_pd, },
#endif
+ { .compatible = "synopsys,usb2-dr-2.20a", },
{},
};
--
1.7.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists