preliminary work for adding imx6q_sabrelite usb support

The ci13xxx hcd require USB_EHCI_ROOT_HUB_TT.

Signed-off-by Richard Zhao <[email protected]>

---
 drivers/usb/host/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

drivers/usb/host/Kconfig +0 -0

index 684a7bb..89d0371 100644

Dear Richard Zhao,

Quoted 3 lines

The ci13xxx hcd require USB_EHCI_ROOT_HUB_TT.

Signed-off-by Richard Zhao <[email protected]>

I already sent similar patch a few hours ago.

The ci13xxx hcd require USB_EHCI_ROOT_HUB_TT.

Signed-off-by Richard Zhao <[email protected]>

---
 drivers/usb/host/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

drivers/usb/host/Kconfig +0 -0

index 684a7bb..89d0371 100644

It's 0 for host only device.

Signed-off-by Richard Zhao <[email protected]>

---
 drivers/usb/chipidea/core.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

drivers/usb/chipidea/core.c +0 -0

index f568b8e..15e03b3 100644

The endpoint count is zero for host-only controller. On the other hand, the endpoint count is non-zero for OTG capable controller.

Signed-off-by Marek Vasut <[email protected]>

Cc Richard Zhao <[email protected]>

Cc alexander.shishkin at linux.intel.com

Cc B20596 at freescale.com

Cc B29397 at freescale.com

Cc dong.aisheng at linaro.org

Cc fabio.estevam at freescale.com

Cc gregkh at linuxfoundation.org

Cc kernel at pengutronix.de

Cc linux-arm-kernel at lists.infradead.org

Cc marex at denx.de

Cc shawn.guo at linaro.org

To: linux-usb at vger.kernel.org

---
 drivers/usb/chipidea/core.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

drivers/usb/chipidea/core.c +1 -0

index f568b8e..b29a204 100644
@@ -174,6 +174,7 @@ u8 hw_port_test_get(struct ci13xxx *ci)
 static int hw_device_init(struct ci13xxx *ci, void __iomem *base)
 {
 	u32 reg;
+	int dc;
 
 	/* bank is a module variable */
 	ci->hw_bank.abs = base;

@@ -195,7 +196,12 @@ static int hw_device_init(struct ci13xxx *ci, void __iomem *base)
 		ffs_nr(DCCPARAMS_DEN);

It's 0 for host only device.

Signed-off-by Richard Zhao <[email protected]>

---
 drivers/usb/chipidea/core.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

drivers/usb/chipidea/core.c +0 -0

index f568b8e..15e03b3 100644

drivers/usb/chipidea/core.c +0 -0

 	dev_dbg(ci->dev, "ChipIdea HDRC found, lpm: %d; cap: %p op: %p\n",

Signature · 1 line

1.7.5.4

Quoted 15 lines · Richard Zhao

It's 0 for host only device.

Signed-off-by Richard Zhao <[email protected]>

---
 drivers/usb/chipidea/core.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

drivers/usb/chipidea/core.c +0 -0

index f568b8e..15e03b3 100644
@@ -195,7 +195,7 @@ static int hw_device_init(struct ci13xxx *ci, void __iomem *base)
 		ffs_nr(DCCPARAMS_DEN);
 	ci->hw_ep_max = reg * 2;   /* cache hw ENDPT_MAX */
 

drivers/usb/chipidea/core.c static int hw_device_init(struct ci13xxx *ci, void __iomem *base) · line 199

Quoted 3 lines

drivers/usb/chipidea/core.c +1 -1

-	if (ci->hw_ep_max == 0 || ci->hw_ep_max > ENDPT_MAX)
+	if (ci->hw_ep_max > ENDPT_MAX)
 		return -ENODEV;

Can you move this get hw_ep_max code to udc.c? As hw_ep_max is only used for device driver. What do you think, Alex?

Quoted 5 lines

drivers/usb/chipidea/core.c +0 -0

 	dev_dbg(ci->dev, "ChipIdea HDRC found, lpm: %d; cap: %p op: %p\n",

Signature · 1 line

1.7.5.4

Signature · 2 lines

Best Regards,
Peter Chen

Quoted 15 lines · Richard Zhao

It's 0 for host only device.

Signed-off-by Richard Zhao <[email protected]>

---
 drivers/usb/chipidea/core.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

drivers/usb/chipidea/core.c +0 -0

index f568b8e..15e03b3 100644
@@ -195,7 +195,7 @@ static int hw_device_init(struct ci13xxx *ci, void __iomem *base)
 		ffs_nr(DCCPARAMS_DEN);
 	ci->hw_ep_max = reg * 2;   /* cache hw ENDPT_MAX */
 

drivers/usb/chipidea/core.c static int hw_device_init(struct ci13xxx *ci, void __iomem *base) · line 199

Quoted 3 lines

drivers/usb/chipidea/core.c +1 -1

-	if (ci->hw_ep_max == 0 || ci->hw_ep_max > ENDPT_MAX)
+	if (ci->hw_ep_max > ENDPT_MAX)
 		return -ENODEV;

Can you move this get hw_ep_max code to udc.c? As hw_ep_max is only used for device driver. What do you think, Alex?

Signed-off-by Richard Zhao <[email protected]>

---
 drivers/usb/chipidea/Makefile       |    4 +
 drivers/usb/chipidea/phy-imx-utmi.c |  140
+++++++++++++++++++++++++++++++++++ 2 files changed, 144 insertions(+), 0
deletions(-)
 create mode 100644 drivers/usb/chipidea/phy-imx-utmi.c

drivers/usb/chipidea/Makefile +4 -0

index cc34937..0f34c0c 100644
@@ -12,3 +12,7 @@ endif
 ifneq ($(CONFIG_ARCH_MSM),)
 	obj-$(CONFIG_USB_CHIPIDEA)	+= ci13xxx_msm.o
 endif
+
+ifneq ($(CONFIG_ARCH_MXC),)
+	obj-$(CONFIG_USB_CHIPIDEA)	+= phy-imx-utmi.o
+endif

(quoted diff) +0 -0

b/drivers/usb/chipidea/phy-imx-utmi.c new file mode 100644 index 0000000..f7a0fe7

drivers/usb/chipidea/phy-imx-utmi.c new file +13 -0

@@ -0,0 +1,140 @@
+/*
+ * Copyright 2012 Freescale Semiconductor, Inc.
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>

drivers/usb/chipidea/phy-imx-utmi.c new file +28 -0

+#define HW_USBPHY_CTRL	0x00000030
+
+#define BM_USBPHY_CTRL_SFTRST 0x80000000
+#define BM_USBPHY_CTRL_CLKGATE 0x40000000
+#define BM_USBPHY_CTRL_ENUTMILEVEL3 0x00008000
+#define BM_USBPHY_CTRL_ENUTMILEVEL2 0x00004000
+
+struct imx_utmi_phy {
+	struct usb_phy phy;
+	struct clk *clk;
+};
+
+#define to_imx_phy(p) container_of((p), struct imx_utmi_phy, phy)
+
+static int imx_utmi_phy_init(struct usb_phy *phy)
+{
+	struct imx_utmi_phy *imx_phy;
+	u32 reg;
+
+	imx_phy = to_imx_phy(phy);
+
+	clk_prepare_enable(imx_phy->clk);
+
+	reg = readl_relaxed(phy->io_priv + HW_USBPHY_CTRL);
+	reg &= ~BM_USBPHY_CTRL_CLKGATE;
+	writel_relaxed(reg, phy->io_priv + HW_USBPHY_CTRL);
+
+	/* Reset USBPHY module */

drivers/usb/chipidea/phy-imx-utmi.c new file +51 -0

+}
+
+static int imx_utmi_probe(struct platform_device *pdev)
+{
+	struct resource *res;
+	void __iomem *base;
+	struct clk *clk;
+	struct imx_utmi_phy *imx_phy;
+
+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+	if (!res) {
+		dev_err(&pdev->dev, "can't get device resources\n");
+		return -ENOENT;
+	}
+
+	base = devm_request_and_ioremap(&pdev->dev, res);
+	if (!base)
+		return -EBUSY;
+
+	clk = devm_clk_get(&pdev->dev, NULL);
+	if (IS_ERR(clk))
+		return PTR_ERR(clk);
+
+	imx_phy = devm_kzalloc(&pdev->dev, sizeof(*imx_phy), GFP_KERNEL);
+	if (!imx_phy)
+		return -ENOMEM;
+
+	imx_phy->phy.io_priv = base;
+	imx_phy->phy.dev = &pdev->dev;
+	imx_phy->phy.label = DRIVER_NAME;
+	imx_phy->phy.init = imx_utmi_phy_init;
+	imx_phy->phy.shutdown = imx_utmi_phy_shutdown;
+	imx_phy->clk = clk;
+	platform_set_drvdata(pdev, &imx_phy->phy);
+
+	return 0;
+}
+
+static const struct of_device_id imx_utmi_dt_ids[] = {
+	{ .compatible = "fsl,imx6q-usbphy", },
+	{ /* sentinel */ }
+};
+
+static struct platform_driver imx_utmi_driver = {
+	.probe = imx_utmi_probe,
+	.driver = {
+		.name = DRIVER_NAME,
+		.of_match_table = imx_utmi_dt_ids,
+	 },
+};
+

drivers/usb/chipidea/phy-imx-utmi.c new file +1 -0

+module_exit(imx_utmi_exit);

drivers/usb/chipidea/ci13xxx_imx.c new file +18 -0

+	plat_ci = platform_device_alloc("ci_hdrc", (int)res->start);
+	if (!plat_ci) {
+		dev_err(&pdev->dev, "can't allocate ci_hdrc platform device\n");
+		return -ENOMEM;
+	}
+
+	ret = platform_device_add_resources(plat_ci, pdev->resource,
+					    pdev->num_resources);
+	if (ret) {
+		dev_err(&pdev->dev, "can't add resources to platform device\n");
+		goto put_platform;
+	}
+
+	ret = platform_device_add_data(plat_ci, &ci13xxx_imx_udc_driver,
+				       sizeof(ci13xxx_imx_udc_driver));
+	if (ret)
+		goto put_platform;
+

Quoted 18 lines · Richard Zhao

drivers/usb/chipidea/ci13xxx_imx.c new file +18 -0

+	plat_ci = platform_device_alloc("ci_hdrc", (int)res->start);
+	if (!plat_ci) {
+		dev_err(&pdev->dev, "can't allocate ci_hdrc platform device\n");
+		return -ENOMEM;
+	}
+
+	ret = platform_device_add_resources(plat_ci, pdev->resource,
+					    pdev->num_resources);
+	if (ret) {
+		dev_err(&pdev->dev, "can't add resources to platform device\n");
+		goto put_platform;
+	}
+
+	ret = platform_device_add_data(plat_ci, &ci13xxx_imx_udc_driver,
+				       sizeof(ci13xxx_imx_udc_driver));
+	if (ret)
+		goto put_platform;
+

drivers/usb/chipidea/ci13xxx_imx.c line 138

Quoted 10 lines

drivers/usb/chipidea/ci13xxx_imx.c new file +10 -0

+	plat_ci->dev.dma_mask =
+		kmalloc(sizeof(*pdev->dev.dma_mask), GFP_KERNEL);
+	if (!plat_ci->dev.dma_mask) {
+		ret = -ENOMEM;
+		goto put_platform;
+	}
+	*plat_ci->dev.dma_mask = DMA_BIT_MASK(32);
+	plat_ci->dev.coherent_dma_mask = DMA_BIT_MASK(32);
+
+	ret = platform_device_add(plat_ci);

Is there a reason not to use platform_device_register_full() ?

Also, you don't set the parent device - is there a dependency between 'pdev' and this new platform device you're creating? If so, it should be a child of 'pdev'.

Quoted 22 lines · Richard Zhao

drivers/usb/chipidea/ci13xxx_imx.c new file +22 -0

+	plat_ci = platform_device_alloc("ci_hdrc", (int)res->start);
+	if (!plat_ci) {
+		dev_err(&pdev->dev, "can't allocate ci_hdrc platform device\n");
+		return -ENOMEM;
+	}
+
+	ret = platform_device_add_resources(plat_ci, pdev->resource,
+					    pdev->num_resources);
+	if (ret) {
+		dev_err(&pdev->dev, "can't add resources to platform device\n");
+		goto put_platform;
+	}
+
+	ret = platform_device_add_data(plat_ci, &ci13xxx_imx_udc_driver,
+				       sizeof(ci13xxx_imx_udc_driver));
+	if (ret)
+		goto put_platform;
+
+	plat_ci->dev.dma_mask =
+		kmalloc(sizeof(*pdev->dev.dma_mask), GFP_KERNEL);
+	if (!plat_ci->dev.dma_mask) {
+		ret = -ENOMEM;

drivers/usb/chipidea/ci13xxx_imx.c line 138

Quoted 6 lines

drivers/usb/chipidea/ci13xxx_imx.c new file +6 -0

+		goto put_platform;
+	}
+	*plat_ci->dev.dma_mask = DMA_BIT_MASK(32);
+	plat_ci->dev.coherent_dma_mask = DMA_BIT_MASK(32);
+
+	ret = platform_device_add(plat_ci);

Is there a reason not to use platform_device_register_full() ?

Also, you don't set the parent device - is there a dependency between 'pdev' and this new platform device you're creating? If so, it should be a child of 'pdev'.

Signed-off-by Richard Zhao <[email protected]>

---
 drivers/usb/chipidea/Makefile      |    2 +-
 drivers/usb/chipidea/ci13xxx_imx.c |  177
++++++++++++++++++++++++++++++++++++ 2 files changed, 178 insertions(+), 1
deletions(-)
 create mode 100644 drivers/usb/chipidea/ci13xxx_imx.c

drivers/usb/chipidea/Makefile +0 -0

index 0f34c0c..6821385 100644

drivers/usb/chipidea/Makefile +0 -0

 endif

(quoted diff) +0 -0

b/drivers/usb/chipidea/ci13xxx_imx.c new file mode 100644 index 0000000..5f36f07

drivers/usb/chipidea/ci13xxx_imx.c new file +20 -0

@@ -0,0 +1,177 @@
+/*
+ * Copyright 2012 Freescale Semiconductor, Inc.
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/of_platform.h>
+#include <linux/of_gpio.h>
+#include <linux/pm_runtime.h>
+#include <linux/usb/ulpi.h>
+#include <linux/usb/gadget.h>
+#include <linux/usb/chipidea.h>
+#include <linux/usb/otg.h>

drivers/usb/chipidea/ci13xxx_imx.c new file +90 -0

+	struct device *dev = udc->gadget.dev.parent;
+	int val;
+
+	switch (event) {
+	case CI13XXX_CONTROLLER_RESET_EVENT:
+		dev_dbg(dev, "CI13XXX_CONTROLLER_RESET_EVENT received\n");
+		writel(0, USB_AHBBURST);
+		writel(0, USB_AHBMODE);
+		break;
+	case CI13XXX_CONTROLLER_STOPPED_EVENT:
+		dev_dbg(dev, "CI13XXX_CONTROLLER_STOPPED_EVENT received\n");
+		/*
+		 * Put the transceiver in non-driving mode. Otherwise host
+		 * may not detect soft-disconnection.
+		 */
+		val = usb_phy_io_read(udc->transceiver, ULPI_FUNC_CTRL);
+		val &= ~ULPI_FUNC_CTRL_OPMODE_MASK;
+		val |= ULPI_FUNC_CTRL_OPMODE_NONDRIVING;
+		usb_phy_io_write(udc->transceiver, val, ULPI_FUNC_CTRL);
+		break;
+	default:
+		dev_dbg(dev, "unknown ci13xxx_udc event\n");
+		break;
+	}
+#endif
+}
+
+static struct ci13xxx_udc_driver ci13xxx_imx_udc_driver = {
+	.name			= "ci13xxx_imx",
+	.flags			= CI13XXX_REGS_SHARED |
+				  CI13XXX_PULLUP_ON_VBUS |
+				  CI13XXX_DISABLE_STREAMING,
+	.capoffset		= 0x100,
+
+	.notify_event		= ci13xxx_imx_notify_event,
+};
+
+static int ci13xxx_imx_probe(struct platform_device *pdev)
+{
+	struct platform_device *plat_ci, *phy_pdev;
+	struct device_node *phy_np;
+	struct resource *res;
+	int hub_reset, vbus_pwr;
+	int ret;
+
+	dev_dbg(&pdev->dev, "ci13xxx_imx_probe\n");
+
+	phy_np = of_parse_phandle(pdev->dev.of_node, "fsl,usbphy", 0);
+	if (phy_np) {
+		phy_pdev = of_find_device_by_node(phy_np);
+		if (phy_pdev) {
+			struct usb_phy *phy;
+			phy = pdev_to_phy(phy_pdev);
+			if (phy)
+				usb_phy_init(phy);
+		}
+		of_node_put(phy_np);
+	}
+
+	hub_reset = of_get_named_gpio(pdev->dev.of_node, "fsl,hub-reset", 0);
+	if (hub_reset > 0 &&
+	    devm_gpio_request(&pdev->dev, hub_reset, "hub-reset")) {
+		gpio_direction_output(hub_reset, 0);
+		udelay(10);
+		gpio_direction_output(hub_reset, 1);
+	}
+
+	/* we only support host now, so enable vbus here */
+	vbus_pwr = of_get_named_gpio(pdev->dev.of_node, "fsl,vbus-power", 0);
+	if (vbus_pwr > 0 &&
+	    devm_gpio_request(&pdev->dev, vbus_pwr, "vbus-pwr")) {
+		gpio_direction_output(vbus_pwr, 1);
+	}
+
+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+	if (!res) {
+		dev_err(&pdev->dev, "can't get device resources\n");
+		return -ENOENT;
+	}
+
+	plat_ci = platform_device_alloc("ci_hdrc", (int)res->start);
+	if (!plat_ci) {
+		dev_err(&pdev->dev, "can't allocate ci_hdrc platform device\n");
+		return -ENOMEM;
+	}
+
+	ret = platform_device_add_resources(plat_ci, pdev->resource,
+					    pdev->num_resources);
+	if (ret) {
+		dev_err(&pdev->dev, "can't add resources to platform device\n");

drivers/usb/chipidea/ci13xxx_imx.c new file +25 -0

+	if (!plat_ci->dev.dma_mask) {
+		ret = -ENOMEM;
+		goto put_platform;
+	}
+	*plat_ci->dev.dma_mask = DMA_BIT_MASK(32);
+	plat_ci->dev.coherent_dma_mask = DMA_BIT_MASK(32);
+
+	ret = platform_device_add(plat_ci);
+	if (ret)
+		goto free_dma_mask;
+
+	pm_runtime_no_callbacks(&pdev->dev);
+	pm_runtime_enable(&pdev->dev);
+
+	return 0;
+
+free_dma_mask:
+	kfree(plat_ci->dev.dma_mask);
+	plat_ci->dev.dma_mask = NULL;
+put_platform:
+	platform_device_put(plat_ci);
+
+	return ret;
+}
+

drivers/usb/chipidea/ci13xxx_imx.c new file +2 -0

+
+MODULE_LICENSE("GPL v2");

Signed-off-by Richard Zhao <[email protected]>

---
 drivers/usb/chipidea/Makefile      |    2 +-
 drivers/usb/chipidea/ci13xxx_imx.c |  177 ++++++++++++++++++++++++++++++++++++
 2 files changed, 178 insertions(+), 1 deletions(-)
 create mode 100644 drivers/usb/chipidea/ci13xxx_imx.c

drivers/usb/chipidea/Makefile +1 -1

index 0f34c0c..6821385 100644
@@ -14,5 +14,5 @@ ifneq ($(CONFIG_ARCH_MSM),)
 endif
 
 ifneq ($(CONFIG_ARCH_MXC),)
-	obj-$(CONFIG_USB_CHIPIDEA)	+= phy-imx-utmi.o
+	obj-$(CONFIG_USB_CHIPIDEA)	+= phy-imx-utmi.o ci13xxx_imx.o
 endif

drivers/usb/chipidea/ci13xxx_imx.c new file +53 -0

new file mode 100644
index 0000000..5f36f07
@@ -0,0 +1,177 @@
+/*
+ * Copyright 2012 Freescale Semiconductor, Inc.
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/of_platform.h>
+#include <linux/of_gpio.h>
+#include <linux/pm_runtime.h>
+#include <linux/usb/ulpi.h>
+#include <linux/usb/gadget.h>
+#include <linux/usb/chipidea.h>
+#include <linux/usb/otg.h>
+#include <linux/dma-mapping.h>
+
+#include "ci.h"
+
+#define pdev_to_phy(pdev) \
+	((struct usb_phy *)platform_get_drvdata(pdev))
+
+static void ci13xxx_imx_notify_event(struct ci13xxx *udc, unsigned event)
+{
+#if 0
+	struct device *dev = udc->gadget.dev.parent;
+	int val;
+
+	switch (event) {
+	case CI13XXX_CONTROLLER_RESET_EVENT:
+		dev_dbg(dev, "CI13XXX_CONTROLLER_RESET_EVENT received\n");
+		writel(0, USB_AHBBURST);
+		writel(0, USB_AHBMODE);
+		break;
+	case CI13XXX_CONTROLLER_STOPPED_EVENT:
+		dev_dbg(dev, "CI13XXX_CONTROLLER_STOPPED_EVENT received\n");
+		/*
+		 * Put the transceiver in non-driving mode. Otherwise host
+		 * may not detect soft-disconnection.
+		 */
+		val = usb_phy_io_read(udc->transceiver, ULPI_FUNC_CTRL);
+		val &= ~ULPI_FUNC_CTRL_OPMODE_MASK;
+		val |= ULPI_FUNC_CTRL_OPMODE_NONDRIVING;
+		usb_phy_io_write(udc->transceiver, val, ULPI_FUNC_CTRL);
+		break;
+	default:
+		dev_dbg(dev, "unknown ci13xxx_udc event\n");
+		break;

drivers/usb/chipidea/ci13xxx_imx.c new file +25 -0

+
+	phy_np = of_parse_phandle(pdev->dev.of_node, "fsl,usbphy", 0);
+	if (phy_np) {
+		phy_pdev = of_find_device_by_node(phy_np);
+		if (phy_pdev) {
+			struct usb_phy *phy;
+			phy = pdev_to_phy(phy_pdev);
+			if (phy)
+				usb_phy_init(phy);
+		}
+		of_node_put(phy_np);
+	}
+
+	hub_reset = of_get_named_gpio(pdev->dev.of_node, "fsl,hub-reset", 0);
+	if (hub_reset > 0 &&
+	    devm_gpio_request(&pdev->dev, hub_reset, "hub-reset")) {
+		gpio_direction_output(hub_reset, 0);
+		udelay(10);
+		gpio_direction_output(hub_reset, 1);
+	}
+
+	/* we only support host now, so enable vbus here */
+	vbus_pwr = of_get_named_gpio(pdev->dev.of_node, "fsl,vbus-power", 0);
+	if (vbus_pwr > 0 &&
+	    devm_gpio_request(&pdev->dev, vbus_pwr, "vbus-pwr")) {

drivers/usb/chipidea/ci13xxx_imx.c new file +66 -0

+	if (!plat_ci) {
+		dev_err(&pdev->dev, "can't allocate ci_hdrc platform device\n");
+		return -ENOMEM;
+	}
+
+	ret = platform_device_add_resources(plat_ci, pdev->resource,
+					    pdev->num_resources);
+	if (ret) {
+		dev_err(&pdev->dev, "can't add resources to platform device\n");
+		goto put_platform;
+	}
+
+	ret = platform_device_add_data(plat_ci, &ci13xxx_imx_udc_driver,
+				       sizeof(ci13xxx_imx_udc_driver));
+	if (ret)
+		goto put_platform;
+
+	plat_ci->dev.dma_mask =
+		kmalloc(sizeof(*pdev->dev.dma_mask), GFP_KERNEL);
+	if (!plat_ci->dev.dma_mask) {
+		ret = -ENOMEM;
+		goto put_platform;
+	}
+	*plat_ci->dev.dma_mask = DMA_BIT_MASK(32);
+	plat_ci->dev.coherent_dma_mask = DMA_BIT_MASK(32);
+
+	ret = platform_device_add(plat_ci);
+	if (ret)
+		goto free_dma_mask;
+
+	pm_runtime_no_callbacks(&pdev->dev);
+	pm_runtime_enable(&pdev->dev);
+
+	return 0;
+
+free_dma_mask:
+	kfree(plat_ci->dev.dma_mask);
+	plat_ci->dev.dma_mask = NULL;
+put_platform:
+	platform_device_put(plat_ci);
+
+	return ret;
+}
+
+static const struct of_device_id ci13xxx_imx_dt_ids[] = {
+	{ .compatible = "fsl,imx6q-usboh3", },
+	{ /* sentinel */ }
+};
+
+static struct platform_driver ci13xxx_imx_driver = {
+	.probe = ci13xxx_imx_probe,
+	.driver = {
+		.name = "imx_usboh3",
+		.of_match_table = ci13xxx_imx_dt_ids,
+	 },
+};
+
+MODULE_ALIAS("platform:imx_usboh3");
+
+static int __init ci13xxx_imx_init(void)
+{
+	return platform_driver_register(&ci13xxx_imx_driver);
+}
+module_init(ci13xxx_imx_init);
+
+MODULE_LICENSE("GPL v2");

Signature · 7 lines

1.7.5.4


--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

drivers/usb/chipidea/ci13xxx_imx.c line 111

Quoted 1 line

drivers/usb/chipidea/ci13xxx_imx.c new file +1 -0

+	plat_ci = platform_device_alloc("ci_hdrc", (int)res->start);

Regarding the instance id here: you probably want to use something more meaningful than the starting address. I was thinking about stealing id allocator from Felipe's dwc3 (dwc3_get_device_id()), but decided to first deal with more important things.

I was considering using idr for this, but it kind of feels like an overkill for this purpose. So I'm wondering if it makes sense to generalize dwc3_get_device_id() so that other drivers can make use of it?

Quoted 1 line · Richard Zhao

Signed-off-by Richard Zhao <[email protected]>

Besides things that were already pointed out, some minor comments below:

Quoted 83 lines

---
 drivers/usb/chipidea/Makefile      |    2 +-
 drivers/usb/chipidea/ci13xxx_imx.c |  177 ++++++++++++++++++++++++++++++++++++
 2 files changed, 178 insertions(+), 1 deletions(-)
 create mode 100644 drivers/usb/chipidea/ci13xxx_imx.c

drivers/usb/chipidea/Makefile +1 -1

index 0f34c0c..6821385 100644
@@ -14,5 +14,5 @@ ifneq ($(CONFIG_ARCH_MSM),)
 endif
 
 ifneq ($(CONFIG_ARCH_MXC),)
-	obj-$(CONFIG_USB_CHIPIDEA)	+= phy-imx-utmi.o
+	obj-$(CONFIG_USB_CHIPIDEA)	+= phy-imx-utmi.o ci13xxx_imx.o
 endif

drivers/usb/chipidea/ci13xxx_imx.c new file +59 -0

new file mode 100644
index 0000000..5f36f07
@@ -0,0 +1,177 @@
+/*
+ * Copyright 2012 Freescale Semiconductor, Inc.
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/of_platform.h>
+#include <linux/of_gpio.h>
+#include <linux/pm_runtime.h>
+#include <linux/usb/ulpi.h>
+#include <linux/usb/gadget.h>
+#include <linux/usb/chipidea.h>
+#include <linux/usb/otg.h>
+#include <linux/dma-mapping.h>
+
+#include "ci.h"
+
+#define pdev_to_phy(pdev) \
+	((struct usb_phy *)platform_get_drvdata(pdev))
+
+static void ci13xxx_imx_notify_event(struct ci13xxx *udc, unsigned event)
+{
+#if 0
+	struct device *dev = udc->gadget.dev.parent;
+	int val;
+
+	switch (event) {
+	case CI13XXX_CONTROLLER_RESET_EVENT:
+		dev_dbg(dev, "CI13XXX_CONTROLLER_RESET_EVENT received\n");
+		writel(0, USB_AHBBURST);
+		writel(0, USB_AHBMODE);
+		break;
+	case CI13XXX_CONTROLLER_STOPPED_EVENT:
+		dev_dbg(dev, "CI13XXX_CONTROLLER_STOPPED_EVENT received\n");
+		/*
+		 * Put the transceiver in non-driving mode. Otherwise host
+		 * may not detect soft-disconnection.
+		 */
+		val = usb_phy_io_read(udc->transceiver, ULPI_FUNC_CTRL);
+		val &= ~ULPI_FUNC_CTRL_OPMODE_MASK;
+		val |= ULPI_FUNC_CTRL_OPMODE_NONDRIVING;
+		usb_phy_io_write(udc->transceiver, val, ULPI_FUNC_CTRL);
+		break;
+	default:
+		dev_dbg(dev, "unknown ci13xxx_udc event\n");
+		break;
+	}
+#endif
+}
+
+static struct ci13xxx_udc_driver ci13xxx_imx_udc_driver = {
+	.name			= "ci13xxx_imx",

drivers/usb/chipidea/ci13xxx_imx.c line 63

Quoted 4 lines

drivers/usb/chipidea/ci13xxx_imx.c new file +4 -0

+	.flags			= CI13XXX_REGS_SHARED |
+				  CI13XXX_PULLUP_ON_VBUS |
+				  CI13XXX_DISABLE_STREAMING,
+	.capoffset		= 0x100,

There's a DEF_CAPOFFSET for this in <linux/usb/chipidea.h>, because this is really a single most popular offset of the capability registers in chipidea controllers.

Quoted 4 lines

drivers/usb/chipidea/ci13xxx_imx.c new file +3 -0

+
+	.notify_event		= ci13xxx_imx_notify_event,
+};

drivers/usb/chipidea/ci13xxx_imx.c line 76

Quoted 10 lines

drivers/usb/chipidea/ci13xxx_imx.c new file +10 -0

+
+static int ci13xxx_imx_probe(struct platform_device *pdev)
+{
+	struct platform_device *plat_ci, *phy_pdev;
+	struct device_node *phy_np;
+	struct resource *res;
+	int hub_reset, vbus_pwr;
+	int ret;
+
+	dev_dbg(&pdev->dev, "ci13xxx_imx_probe\n");

Certain people don't take kindly to adding debug prints like this one. :)

Quoted 33 lines

drivers/usb/chipidea/ci13xxx_imx.c new file +32 -0

+
+	phy_np = of_parse_phandle(pdev->dev.of_node, "fsl,usbphy", 0);
+	if (phy_np) {
+		phy_pdev = of_find_device_by_node(phy_np);
+		if (phy_pdev) {
+			struct usb_phy *phy;
+			phy = pdev_to_phy(phy_pdev);
+			if (phy)
+				usb_phy_init(phy);
+		}
+		of_node_put(phy_np);
+	}
+
+	hub_reset = of_get_named_gpio(pdev->dev.of_node, "fsl,hub-reset", 0);
+	if (hub_reset > 0 &&
+	    devm_gpio_request(&pdev->dev, hub_reset, "hub-reset")) {
+		gpio_direction_output(hub_reset, 0);
+		udelay(10);
+		gpio_direction_output(hub_reset, 1);
+	}
+
+	/* we only support host now, so enable vbus here */
+	vbus_pwr = of_get_named_gpio(pdev->dev.of_node, "fsl,vbus-power", 0);
+	if (vbus_pwr > 0 &&
+	    devm_gpio_request(&pdev->dev, vbus_pwr, "vbus-pwr")) {
+		gpio_direction_output(vbus_pwr, 1);
+	}
+
+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+	if (!res) {
+		dev_err(&pdev->dev, "can't get device resources\n");
+		return -ENOENT;

drivers/usb/chipidea/ci13xxx_imx.c line 111

Quoted 3 lines

drivers/usb/chipidea/ci13xxx_imx.c new file +3 -0

+	}
+
+	plat_ci = platform_device_alloc("ci_hdrc", (int)res->start);

Regarding the instance id here: you probably want to use something more meaningful than the starting address. I was thinking about stealing id allocator from Felipe's dwc3 (dwc3_get_device_id()), but decided to first deal with more important things.

I was considering using idr for this, but it kind of feels like an overkill for this purpose. So I'm wondering if it makes sense to generalize dwc3_get_device_id() so that other drivers can make use of it?

Quoted 6 lines · Alexander Shishkin

drivers/usb/chipidea/ci13xxx_imx.c line 111

Quoted 1 line

drivers/usb/chipidea/ci13xxx_imx.c new file +1 -0

+	plat_ci = platform_device_alloc("ci_hdrc", (int)res->start);

Regarding the instance id here: you probably want to use something more meaningful than the starting address. I was thinking about stealing id allocator from Felipe's dwc3 (dwc3_get_device_id()), but decided to first deal with more important things.

hmm... Is dwc3_get_device_id() really meaningful than base address? It just record the sequence number.

Quoted 7 lines · Richard Zhao

Quoted 6 lines · Alexander Shishkin

drivers/usb/chipidea/ci13xxx_imx.c line 111

Quoted 1 line

drivers/usb/chipidea/ci13xxx_imx.c new file +1 -0

+	plat_ci = platform_device_alloc("ci_hdrc", (int)res->start);

Regarding the instance id here: you probably want to use something more meaningful than the starting address. I was thinking about stealing id allocator from Felipe's dwc3 (dwc3_get_device_id()), but decided to first deal with more important things.

Quoted 2 lines

hmm... Is dwc3_get_device_id() really meaningful than base address? It just record the sequence number.

Well, if you indeed have more than one controller, you might want to know, for example, which one registered first. Or, one might simply not like the look of "/sys/bus/platform/devices/ci_hdrc.-5898240".

Regards,
--
Alex

The work is based on usb-next which includes ci13xxx rework by Alexander Shishkin.

Status:
- this version only tested host
- usbotg controler works at host role

Todo:
- usbh1 has strange system error when enumerate devices for on-board hub.
- high speed usb connecton detect failed for the second time. It needs
hub code hack.

Thanks Peter Chen for greate help.

Richard Zhao (7):
usb: chipidea: permit user select USB_EHCI_ROOT_HUB_TT
usb: chipidea: remove zero check of hw_ep_max
usb: chipidea: add imx on-soc utmi phy driver
usb: chipidea: add imx driver binding
ARM: imx6q: correct device name of usbphy and usboh3 clock export
ARM: imx6q: add anatop initialization for usb controllers
ARM: dts: imx6q-sabrelite: add usb devices

 arch/arm/boot/dts/imx6q-sabrelite.dts |   19 ++++-
 arch/arm/boot/dts/imx6q.dtsi          |   44 ++++++++-
 arch/arm/mach-imx/clk-imx6q.c         |    7 +-
 arch/arm/mach-imx/mach-imx6q.c        |   60 +++++++++++
 drivers/usb/chipidea/Makefile         |    4 +
 drivers/usb/chipidea/ci13xxx_imx.c    |  177
+++++++++++++++++++++++++++++++++ drivers/usb/chipidea/core.c           | 
  2 +-
 drivers/usb/chipidea/phy-imx-utmi.c   |  140 ++++++++++++++++++++++++++
 drivers/usb/host/Kconfig              |    2 +-
 9 files changed, 449 insertions(+), 6 deletions(-)
 create mode 100644 drivers/usb/chipidea/ci13xxx_imx.c
 create mode 100644 drivers/usb/chipidea/phy-imx-utmi.c

Dear Richard Zhao,

Quoted 12 lines

The work is based on usb-next which includes ci13xxx rework by Alexander Shishkin.

Status:
- this version only tested host
- usbotg controler works at host role

Todo:
- usbh1 has strange system error when enumerate devices for on-board hub.
- high speed usb connecton detect failed for the second time. It needs
hub code hack.

Quoted 1 line

Thanks Peter Chen for greate help.

Hm, I think we should somehow coordinate, because I think we're working on the same thing and we're duplicating work.

Quoted 16 lines

Dear Richard Zhao,

Quoted 14 lines

The work is based on usb-next which includes ci13xxx rework by Alexander Shishkin.

Status:
- this version only tested host
- usbotg controler works at host role

Todo:
- usbh1 has strange system error when enumerate devices for on-board hub. - high speed usb connecton detect failed for the second time. It needs

hub code hack.

Quoted 4 lines

Quoted 1 line

Thanks Peter Chen for greate help.

Hm, I think we should somehow coordinate, because I think we're working on the same thing and we're duplicating work.

Ok, can the two of you work together on this so I don't get conflicting patches, and so you both can verify it works properly for your systems?

thanks,

greg k-h

Dear Greg KH,

Quoted 19 lines · Marek Vasut

Quoted 18 lines

Dear Richard Zhao,

Quoted 15 lines

The work is based on usb-next which includes ci13xxx rework by Alexander Shishkin.

Status:
- this version only tested host
- usbotg controler works at host role

Todo:
- usbh1 has strange system error when enumerate devices for on-board hub. - high speed usb connecton detect failed for the second time. It needs

hub code hack.

Thanks Peter Chen for greate help.

Quoted 5 lines

Quoted 2 lines

Hm, I think we should somehow coordinate, because I think we're working on the same thing and we're duplicating work.

Ok, can the two of you work together on this so I don't get conflicting patches, and so you both can verify it works properly for your systems?

Yes, I'd prefer to.

Richard, are these 7 patches the only stuff that I have to apply on top of linux-usb/usb-next to get this working?

Quoted 4 lines

thanks,

greg k-h

Best regards,
Marek Vasut

Quoted 1 line

Yes, I'd prefer to.

Me too. I think we can start with review each other's patch.

Quoted 3 lines

Richard, are these 7 patches the only stuff that I have to apply on top of linux-usb/usb-next to get this working?

Yes.

Quoted 8 lines

Quoted 1 line

Yes, I'd prefer to.

Me too. I think we can start with review each other's patch.

Quoted 2 lines

Richard, are these 7 patches the only stuff that I have to apply on top of linux-usb/usb-next to get this working?

Yes.

Hi Marek and Richard,

The i.mx28 and i.mx6q use the same USB controller and USB PHY, Your patchset can be totally the same, only different is platform part. Below are my commnets for your patchset:
- Use drivers/usb/otg/mxs-phy.c as PHY's driver.
- Use drivers/usb/chipidea/ci13xxx_imx.c as controller's driver, all freescale usb uses the same controller.
- Use DT for platform support, phandle can work around current multi-phy support problem.

My proposal how you work together (already discussed with richard)
- Richard picks marek's controller's patch, and add DT support for i.mx28, send marek, me, shawn privately.
- Marek tunes this DT patched patchset at i.mx28 platform, and add Signed-off-by: Richard Zhao <[email protected]>

for patchset, and send to mail list for review
- Richard tests it and give some comments if there is any problems at i.mx6q.
- Marek re-sends this patchset to mail list for review

Marek, if you agree with it, please take the responsibilities of the owner with this patchset, and be active during this patchset review procedure.

Fine with me, where can I get DT-enabled MXS kernel tree please?