MXS: Add i.MX28 USB Host driver

clk code has been re-worked to adopt common clk framework.

Thanks
Richard

Modify USB EHCI and USB PHY base addresses on the i.MX233 to nicely fit into the whole USB registration scheme.

Based on code by:
Tony Lin <[email protected]>

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

Cc Chen Peter-B29397 <[email protected]>

Cc Detlev Zundel <[email protected]>

Cc Fabio Estevam <[email protected]>

Cc Li Frank-B20596 <[email protected]>

Cc Linux USB <[email protected]>

Cc Liu JunJie-B08287 <[email protected]>

Cc Sascha Hauer <[email protected]>

Cc Shawn Guo <[email protected]>

Cc Shi Make-B15407 <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Subodh Nijsure <[email protected]>

Cc Wolfgang Denk <[email protected]>

---
 arch/arm/mach-mxs/include/mach/mx23.h |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

arch/arm/mach-mxs/include/mach/mx23.h +0 -0

index 599094b..7955b75 100644

arch/arm/mach-mxs/include/mach/mx23.h +2 -2

 #define MX23_DRAM_BASE_ADDR		(MX23_IO_BASE_ADDR + 0x0e0000)
 
 #define MX23_IO_P2V(x)			MXS_IO_P2V(x)

@@ -89,8 +89,8 @@
 #define MX23_INT_SPDIF_ERROR		10
 #define MX23_INT_SAIF1_IRQ		10
 #define MX23_INT_SAIF2_IRQ		10
-#define MX23_INT_USB_CTRL		11
-#define MX23_INT_USB_WAKEUP		12
+#define MX23_INT_USB0			11
+#define MX23_INT_USB0_WAKEUP		12
 #define MX23_INT_GPMI_DMA		13
 #define MX23_INT_SSP1_DMA		14
 #define MX23_INT_SSP1_ERROR		15

Signature · 6 lines

1.7.10

--
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

Quoted 34 lines

Modify USB EHCI and USB PHY base addresses on the i.MX233 to nicely fit into the whole USB registration scheme.

Based on code by:
Tony Lin <[email protected]>

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

Cc Chen Peter-B29397 <[email protected]>

Cc Detlev Zundel <[email protected]>

Cc Fabio Estevam <[email protected]>

Cc Li Frank-B20596 <[email protected]>

Cc Linux USB <[email protected]>

Cc Liu JunJie-B08287 <[email protected]>

Cc Sascha Hauer <[email protected]>

Cc Shawn Guo <[email protected]>

Cc Shi Make-B15407 <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Subodh Nijsure <[email protected]>

Cc Wolfgang Denk <[email protected]>

---

 arch/arm/mach-mxs/include/mach/mx23.h |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(quoted diff) +0 -0

b/arch/arm/mach-mxs/include/mach/mx23.h index 599094b..7955b75 100644

arch/arm/mach-mxs/include/mach/mx23.h +0 -0

@@ -64,8 +64,8 @@
 
 #define MX23_AUART1_BASE_ADDR		(MX23_IO_BASE_ADDR + 0x06c000)
 #define MX23_AUART2_BASE_ADDR		(MX23_IO_BASE_ADDR + 0x06e000)
 #define MX23_DUART_BASE_ADDR		(MX23_IO_BASE_ADDR + 0x070000)
 

arch/arm/mach-mxs/include/mach/mx23.h line 68

Quoted 4 lines

arch/arm/mach-mxs/include/mach/mx23.h +2 -2

-#define MX23_USBPHY_BASE_ADDR		(MX23_IO_BASE_ADDR + 0x07c000)
-#define MX23_USBCTRL_BASE_ADDR		(MX23_IO_BASE_ADDR + 0x080000)
+#define MX23_USBPHY0_BASE_ADDR		(MX23_IO_BASE_ADDR + 0x07c000)
+#define MX23_USBCTRL0_BASE_ADDR		(MX23_IO_BASE_ADDR + 0x080000)

Why not migrate to DT?

Thanks
Richard

Quoted 10 lines

arch/arm/mach-mxs/include/mach/mx23.h +0 -0

 #define MX23_DRAM_BASE_ADDR		(MX23_IO_BASE_ADDR + 0x0e0000)

#define MX23_IO_P2V(x) MXS_IO_P2V(x)

arch/arm/mach-mxs/include/mach/mx23.h +0 -0

@@ -89,8 +89,8 @@
 
 #define MX23_INT_SPDIF_ERROR		10
 #define MX23_INT_SAIF1_IRQ		10
 #define MX23_INT_SAIF2_IRQ		10
 

Quoted 8 lines

arch/arm/mach-mxs/include/mach/mx23.h +2 -2

-#define MX23_INT_USB_CTRL		11
-#define MX23_INT_USB_WAKEUP		12
+#define MX23_INT_USB0			11
+#define MX23_INT_USB0_WAKEUP		12
 

#define MX23_INT_GPMI_DMA 13
#define MX23_INT_SSP1_DMA 14
#define MX23_INT_SSP1_ERROR 15

This patch adds common data shared between the MXS EHCI HCD driver, the MXS USB Gadget driver and the imx-otg driver. These data allow passing clock and memory stuff from imx-otg driver into the host/gadget driver.

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

Cc Chen Peter-B29397 <[email protected]>

Cc Detlev Zundel <[email protected]>

Cc Fabio Estevam <[email protected]>

Cc Li Frank-B20596 <[email protected]>

Cc Linux USB <[email protected]>

Cc Liu JunJie-B08287 <[email protected]>

Cc Sascha Hauer <[email protected]>

Cc Shawn Guo <[email protected]>

Cc Shi Make-B15407 <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Subodh Nijsure <[email protected]>

Cc Wolfgang Denk <[email protected]>

---
 include/linux/usb/mxs-usb.h |   39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 include/linux/usb/mxs-usb.h

include/linux/usb/mxs-usb.h new file +23 -0

new file mode 100644
index 0000000..2678700
@@ -0,0 +1,39 @@
+/*
+ * include/linux/usb/mxs-usb.h
+ *
+ * Freescale i.MX USB driver shared data.
+ *
+ * Copyright (C) 2012 Marek Vasut <[email protected]>
+ * on behalf of DENX Software Engineering GmbH
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+

include/linux/usb/mxs-usb.h new file +6 -0

+
+struct mxs_ci13xxx_phy_notify {
+	bool			discon;
+};
+
+#endif /* __INCLUDE_LINUX_USB_MXS_USB_H__ */

Signature · 6 lines

1.7.10

--
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

Add driver that controls the built-in USB PHY in the i.MX233/i.MX28. This enables the PHY upon powerup and shuts it down on shutdown.

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

Cc Chen Peter-B29397 <[email protected]>

Cc Detlev Zundel <[email protected]>

Cc Fabio Estevam <[email protected]>

Cc Li Frank-B20596 <[email protected]>

Cc Linux USB <[email protected]>

Cc Liu JunJie-B08287 <[email protected]>

Cc Sascha Hauer <[email protected]>

Cc Shawn Guo <[email protected]>

Cc Shi Make-B15407 <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Subodh Nijsure <[email protected]>

Cc Wolfgang Denk <[email protected]>

---
 drivers/usb/otg/Kconfig   |   10 ++
 drivers/usb/otg/Makefile  |    1 +
 drivers/usb/otg/mxs-phy.c |  313 +++++++++++++++++++++++++++++++++++++++++++++

 3 files changed, 324 insertions(+)
 create mode 100644 drivers/usb/otg/mxs-phy.c

drivers/usb/otg/Kconfig +10 -0

index 5c87db0..bc7625e 100644
@@ -116,6 +116,16 @@ config FSL_USB2_OTG
 	help
 	  Enable this to support Freescale USB OTG transceiver.
 
+config USB_MXS_PHY
+	tristate "Freescale i.MX28 USB PHY support"
+	select USB_OTG_UTILS
+	select USB_IMX_COMPOSITE
+	help
+	  Say Y here if you want to build Freescale i.MX28 USB PHY
+	  driver in kernel.
+
+	  To compile this driver as a module, choose M here.
+
 config USB_MV_OTG
 	tristate "Marvell USB OTG support"
 	depends on USB_EHCI_MV && USB_MV_UDC && USB_SUSPEND

drivers/usb/otg/Makefile +1 -0

index 41aa509..a844b8d 100644
@@ -20,4 +20,5 @@ obj-$(CONFIG_USB_MSM_OTG)	+= msm_otg.o
 obj-$(CONFIG_AB8500_USB)	+= ab8500-usb.o
 fsl_usb2_otg-objs		:= fsl_otg.o otg_fsm.o
 obj-$(CONFIG_FSL_USB2_OTG)	+= fsl_usb2_otg.o
+obj-$(CONFIG_USB_MXS_PHY)	+= mxs-phy.o
 obj-$(CONFIG_USB_MV_OTG)	+= mv_otg.o

drivers/usb/otg/mxs-phy.c new file +80 -0

new file mode 100644
index 0000000..eb658ca
@@ -0,0 +1,313 @@
+/*
+ * drivers/usb/otg/mxs-phy.c
+ *
+ * Freescale i.MX28 USB PHY driver.
+ *
+ * Copyright (C) 2012 Marek Vasut <[email protected]>
+ * on behalf of DENX Software Engineering GmbH
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/dma-mapping.h>
+#include <linux/slab.h>
+#include <linux/delay.h>
+
+#include <linux/usb.h>
+#include <linux/usb/ch9.h>
+#include <linux/usb/otg.h>
+#include <linux/usb/gadget.h>
+#include <linux/usb/hcd.h>
+#include <linux/usb/ehci_def.h>
+
+#include <mach/common.h>
+#include <mach/hardware.h>
+#include <mach/devices-common.h>
+#include <mach/mx28.h>
+
+/* MXS USB PHY register definitions. */
+#define HW_USBPHY_PWD				0x00
+
+#define HW_USBPHY_CTRL				0x30
+#define HW_USBPHY_CTRL_SET			0x34
+#define HW_USBPHY_CTRL_CLR			0x38
+#define HW_USBPHY_CTRL_TOG			0x3c
+
+#define BM_USBPHY_CTRL_SFTRST			(1 << 31)
+#define BM_USBPHY_CTRL_CLKGATE			(1 << 30)
+#define BM_USBPHY_CTRL_ENVBUSCHG_WKUP		(1 << 23)
+#define BM_USBPHY_CTRL_ENIDCHG_WKUP		(1 << 22)
+#define BM_USBPHY_CTRL_ENDPDMCHG_WKUP		(1 << 21)
+#define BM_USBPHY_CTRL_WAKEUP_IRQ		(1 << 17)
+#define BM_USBPHY_CTRL_ENIRQWAKEUP		(1 << 16)
+#define BM_USBPHY_CTRL_ENUTMILEVEL3		(1 << 15)
+#define BM_USBPHY_CTRL_ENUTMILEVEL2		(1 << 14)
+#define BM_USBPHY_CTRL_ENIRQDEVPLUGIN		(1 << 11)
+#define BM_USBPHY_CTRL_RESUME_IRQ		(1 << 10)
+#define BM_USBPHY_CTRL_ENIRQRESUMEDETECT	(1 << 9)
+#define BM_USBPHY_CTRL_ENOTGIDDETECT		(1 << 7)
+#define BM_USBPHY_CTRL_ENDEVPLUGINDETECT	(1 << 4)
+#define BM_USBPHY_CTRL_HOSTDISCONDETECT_IRQ	(1 << 3)
+#define BM_USBPHY_CTRL_ENIRQHOSTDISCON		(1 << 2)
+#define BM_USBPHY_CTRL_ENHOSTDISCONDETECT	(1 << 1)
+
+#define HW_USBPHY_STATUS			0x40
+
+#define BM_USBPHY_STATUS_OTGID_STATUS		(1 << 8)
+#define BM_USBPHY_STATUS_DEVPLUGIN_STATUS	(1 << 6)
+#define BM_USBPHY_STATUS_HOSTDISCON_STATUS	(1 << 3)
+
+struct mxs_usb_phy {
+	struct usb_phy		phy;
+	struct usb_otg		otg;
+	struct clk		*clk;
+	bool			discon;
+};
+

drivers/usb/otg/mxs-phy.c new file +5 -0

+
+	/* Power up the PHY. */
+	writel(0, x->io_priv + HW_USBPHY_PWD);
+
+	/* Clear the wakeup IRQ before enabling them below. */

drivers/usb/otg/mxs-phy.c new file +60 -0

+
+	writel(val, x->io_priv + HW_USBPHY_CTRL_SET);
+
+	return 0;
+}
+
+static void mxs_usb_phy_shutdown(struct usb_phy *x)
+{
+	struct mxs_usb_phy *phy = container_of(x, struct mxs_usb_phy, phy);
+	uint32_t val;
+
+	/* Clear the wakeup IRQ before disabling them below. */
+	writel(BM_USBPHY_CTRL_RESUME_IRQ | BM_USBPHY_CTRL_WAKEUP_IRQ,
+		x->io_priv + HW_USBPHY_CTRL_CLR);
+
+	/* Disable FS/LS compatibility and wakeup IRQs. */
+	val = BM_USBPHY_CTRL_ENUTMILEVEL2 | BM_USBPHY_CTRL_ENUTMILEVEL3 |
+		BM_USBPHY_CTRL_ENIRQWAKEUP;
+
+	/* Disable IRQ sources. */
+	val |= BM_USBPHY_CTRL_ENIDCHG_WKUP | BM_USBPHY_CTRL_ENDPDMCHG_WKUP |
+		BM_USBPHY_CTRL_ENVBUSCHG_WKUP;
+
+	writel(val, x->io_priv + HW_USBPHY_CTRL_CLR);
+
+	/*
+	 * The interrupt must be disabled for at least 3 cycles of the
+	 * standby clock (32kHz), that is 0.094 ms.
+	 */
+	udelay(100);
+
+	/* Gate off the PHY. */
+	writel(BM_USBPHY_CTRL_CLKGATE, x->io_priv + HW_USBPHY_CTRL_SET);
+
+	/* Disable clock to the PHY. */
+	clk_disable(phy->clk);
+}
+
+static int mxs_otg_set_host(struct usb_otg *otg, struct usb_bus *host)
+{
+	return 0;
+}
+
+static int mxs_otg_set_peripheral(struct usb_otg *otg, struct usb_gadget *gg)
+{
+	return 0;
+}
+
+static int mxs_otg_set_vbus(struct usb_otg *otg, bool enabled)
+{
+	return 0;
+}
+
+static int mxs_usb_phy_notify(struct usb_phy *x, void *data)
+{
+	struct mxs_usb_phy *phy = container_of(x, struct mxs_usb_phy, phy);
+	struct mxs_ci13xxx_phy_notify *notify = data;
+
+	if (notify->discon == phy->discon)
+		return 0;

drivers/usb/otg/mxs-phy.c new file +27 -0

+
+	return 0;
+}
+
+static int __devinit mxs_phy_probe(struct platform_device *pdev)
+{
+	struct mxs_usb_phy *phy;
+	struct resource *mem_res;
+	void *retp;
+	int ret;
+	struct usb_otg *otg;
+
+	/* Allocate PHY driver's private data. */
+	phy = devm_kzalloc(&pdev->dev, sizeof(*phy), GFP_KERNEL);
+	if (!phy) {
+		dev_err(&pdev->dev, "Failed to allocate USB PHY structure!\n");
+		return -ENOMEM;
+	}
+
+	/* Get memory area for PHY from resources. */
+	mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+	if (!mem_res) {
+		dev_err(&pdev->dev, "Specify memory area for this USB PHY!\n");
+		return -ENODEV;
+	}
+
+	/* Request the memory region for this USB PHY. */

drivers/usb/otg/mxs-phy.c new file +17 -0

+	if (ret) {
+		dev_err(&pdev->dev, "Failed to prepare clock for USB PHY!\n");
+		goto err_prepare_phy_clock;
+	}
+
+	/* Setup the PHY structures. */
+	phy->phy.dev		= &pdev->dev;
+	phy->phy.label		= "mxs-usb-phy";
+	phy->phy.init		= mxs_usb_phy_init;
+	phy->phy.shutdown	= mxs_usb_phy_shutdown;
+	phy->phy.notify		= mxs_usb_phy_notify;
+	phy->phy.state		= OTG_STATE_UNDEFINED;
+
+	otg			= &phy->otg;
+	phy->phy.otg		= otg;
+
+	otg->phy		= &phy->phy;

drivers/usb/otg/mxs-phy.c new file +44 -0

+	if (ret) {
+		dev_err(&pdev->dev, "Can't register transceiver, (%d)\n", ret);
+		goto err_set_transceiver;
+	}
+
+	return 0;
+
+err_set_transceiver:
+	clk_unprepare(phy->clk);
+err_prepare_phy_clock:
+	clk_put(phy->clk);
+	return ret;
+}
+
+static int __devexit mxs_phy_remove(struct platform_device *pdev)
+{
+	struct mxs_usb_phy *phy = platform_get_drvdata(pdev);
+
+	/* Power down the PHY. */
+	mxs_usb_phy_shutdown(&phy->phy);
+
+	/* Remove the transceiver. */
+	usb_set_transceiver(NULL);
+
+	/* Stop the PHY clock. */
+	clk_disable_unprepare(phy->clk);
+	clk_put(phy->clk);
+
+	/* Free the rest. */
+	platform_set_drvdata(pdev, NULL);
+
+	return 0;
+}
+
+static struct platform_driver mxs_phy_driver = {
+	.probe		= mxs_phy_probe,
+	.remove		= __devexit_p(mxs_phy_remove),
+	.driver		= {
+		.name	= "mxs-usb-phy",
+		.owner	= THIS_MODULE,
+	},
+};
+
+static int __init mxs_phy_init(void)

drivers/usb/otg/mxs-phy.c new file +6 -0

+module_exit(mxs_phy_exit);
+
+MODULE_ALIAS("platform:mxs-usb-phy");
+MODULE_AUTHOR("Marek Vasut <[email protected]>");
+MODULE_DESCRIPTION("Freescale i.MX28 USB PHY driver");
+MODULE_LICENSE("GPL");

Signature · 6 lines

1.7.10

--
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

Hi Marek,

Quoted 18 lines · Marek Vasut

Add driver that controls the built-in USB PHY in the i.MX233/i.MX28. This enables the PHY upon powerup and shuts it down on shutdown.

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

Cc Chen Peter-B29397 <[email protected]>

Cc Detlev Zundel <[email protected]>

Cc Fabio Estevam <[email protected]>

Cc Li Frank-B20596 <[email protected]>

Cc Linux USB <[email protected]>

Cc Liu JunJie-B08287 <[email protected]>

Cc Sascha Hauer <[email protected]>

Cc Shawn Guo <[email protected]>

Cc Shi Make-B15407 <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Subodh Nijsure <[email protected]>

Cc Wolfgang Denk <[email protected]>

---

Quoted 4 lines

 drivers/usb/otg/Kconfig   |   10 ++
 drivers/usb/otg/Makefile  |    1 +
 drivers/usb/otg/mxs-phy.c |  313

+++++++++++++++++++++++++++++++++++++++++++++

imx is more common.

Quoted 134 lines

 3 files changed, 324 insertions(+)
 create mode 100644 drivers/usb/otg/mxs-phy.c

drivers/usb/otg/Kconfig +10 -0

index 5c87db0..bc7625e 100644
@@ -116,6 +116,16 @@ config FSL_USB2_OTG
 
 	help
 
 	  Enable this to support Freescale USB OTG transceiver.
 
+config USB_MXS_PHY
+	tristate "Freescale i.MX28 USB PHY support"
+	select USB_OTG_UTILS
+	select USB_IMX_COMPOSITE
+	help
+	  Say Y here if you want to build Freescale i.MX28 USB PHY
+	  driver in kernel.
+
+	  To compile this driver as a module, choose M here.
+
 

config USB_MV_OTG

drivers/usb/otg/Kconfig +0 -0

 	tristate "Marvell USB OTG support"
 	depends on USB_EHCI_MV && USB_MV_UDC && USB_SUSPEND

drivers/usb/otg/Makefile +1 -0

index 41aa509..a844b8d 100644
@@ -20,4 +20,5 @@ obj-$(CONFIG_USB_MSM_OTG)	+= msm_otg.o
 
 obj-$(CONFIG_AB8500_USB)	+= ab8500-usb.o
 fsl_usb2_otg-objs		:= fsl_otg.o otg_fsm.o
 obj-$(CONFIG_FSL_USB2_OTG)	+= fsl_usb2_otg.o
 
+obj-$(CONFIG_USB_MXS_PHY)	+= mxs-phy.o
 
 obj-$(CONFIG_USB_MV_OTG)	+= mv_otg.o

drivers/usb/otg/mxs-phy.c new file +85 -0

new file mode 100644
index 0000000..eb658ca
@@ -0,0 +1,313 @@
+/*
+ * drivers/usb/otg/mxs-phy.c
+ *
+ * Freescale i.MX28 USB PHY driver.
+ *
+ * Copyright (C) 2012 Marek Vasut <[email protected]>
+ * on behalf of DENX Software Engineering GmbH
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/dma-mapping.h>
+#include <linux/slab.h>
+#include <linux/delay.h>
+
+#include <linux/usb.h>
+#include <linux/usb/ch9.h>
+#include <linux/usb/otg.h>
+#include <linux/usb/gadget.h>
+#include <linux/usb/hcd.h>
+#include <linux/usb/ehci_def.h>
+
+#include <mach/common.h>
+#include <mach/hardware.h>
+#include <mach/devices-common.h>
+#include <mach/mx28.h>
+
+/* MXS USB PHY register definitions. */
+#define HW_USBPHY_PWD				0x00
+
+#define HW_USBPHY_CTRL				0x30
+#define HW_USBPHY_CTRL_SET			0x34
+#define HW_USBPHY_CTRL_CLR			0x38
+#define HW_USBPHY_CTRL_TOG			0x3c
+
+#define BM_USBPHY_CTRL_SFTRST			(1 << 31)
+#define BM_USBPHY_CTRL_CLKGATE			(1 << 30)
+#define BM_USBPHY_CTRL_ENVBUSCHG_WKUP		(1 << 23)
+#define BM_USBPHY_CTRL_ENIDCHG_WKUP		(1 << 22)
+#define BM_USBPHY_CTRL_ENDPDMCHG_WKUP		(1 << 21)
+#define BM_USBPHY_CTRL_WAKEUP_IRQ		(1 << 17)
+#define BM_USBPHY_CTRL_ENIRQWAKEUP		(1 << 16)
+#define BM_USBPHY_CTRL_ENUTMILEVEL3		(1 << 15)
+#define BM_USBPHY_CTRL_ENUTMILEVEL2		(1 << 14)
+#define BM_USBPHY_CTRL_ENIRQDEVPLUGIN		(1 << 11)
+#define BM_USBPHY_CTRL_RESUME_IRQ		(1 << 10)
+#define BM_USBPHY_CTRL_ENIRQRESUMEDETECT	(1 << 9)
+#define BM_USBPHY_CTRL_ENOTGIDDETECT		(1 << 7)
+#define BM_USBPHY_CTRL_ENDEVPLUGINDETECT	(1 << 4)
+#define BM_USBPHY_CTRL_HOSTDISCONDETECT_IRQ	(1 << 3)
+#define BM_USBPHY_CTRL_ENIRQHOSTDISCON		(1 << 2)
+#define BM_USBPHY_CTRL_ENHOSTDISCONDETECT	(1 << 1)
+
+#define HW_USBPHY_STATUS			0x40
+
+#define BM_USBPHY_STATUS_OTGID_STATUS		(1 << 8)
+#define BM_USBPHY_STATUS_DEVPLUGIN_STATUS	(1 << 6)
+#define BM_USBPHY_STATUS_HOSTDISCON_STATUS	(1 << 3)
+
+struct mxs_usb_phy {
+	struct usb_phy		phy;
+	struct usb_otg		otg;
+	struct clk		*clk;
+	bool			discon;
+};
+
+static int mxs_usb_phy_init(struct usb_phy *x)
+{
+	struct mxs_usb_phy *phy = container_of(x, struct mxs_usb_phy, phy);
+	uint32_t val;
+

drivers/usb/otg/mxs-phy.c line 90

Quoted 5 lines

drivers/usb/otg/mxs-phy.c new file +5 -0

+	/* Enable clock to the PHY. */
+	clk_enable(phy->clk);
+
+	/* Reset the PHY block. */
+	mxs_reset_block(x->io_priv + HW_USBPHY_CTRL);

I find mxs_reset_block is defined in platform code. It breaks multi-soc in one image.

Quoted 11 lines

drivers/usb/otg/mxs-phy.c new file +10 -0

+
+	/* Power up the PHY. */
+	writel(0, x->io_priv + HW_USBPHY_PWD);
+
+	/* Clear the wakeup IRQ before enabling them below. */
+	writel(BM_USBPHY_CTRL_RESUME_IRQ | BM_USBPHY_CTRL_WAKEUP_IRQ,
+		x->io_priv + HW_USBPHY_CTRL_CLR);
+
+	/* Enable FS/LS compatibility and wakeup IRQs. */
+	val = BM_USBPHY_CTRL_ENUTMILEVEL2 | BM_USBPHY_CTRL_ENUTMILEVEL3 |

drivers/usb/otg/mxs-phy.c line 105

Quoted 5 lines

drivers/usb/otg/mxs-phy.c new file +5 -0

+		BM_USBPHY_CTRL_ENIRQWAKEUP;
+
+	/* Enable IRQ sources. */
+	val |= BM_USBPHY_CTRL_ENIDCHG_WKUP | BM_USBPHY_CTRL_ENDPDMCHG_WKUP |
+		BM_USBPHY_CTRL_ENVBUSCHG_WKUP;

It's a little different from my steps. I copied it from fsl kernel. Peter, maybe you can comment?

Quoted 66 lines

drivers/usb/otg/mxs-phy.c new file +44 -0

+
+	writel(val, x->io_priv + HW_USBPHY_CTRL_SET);
+
+	return 0;
+}
+
+static void mxs_usb_phy_shutdown(struct usb_phy *x)
+{
+	struct mxs_usb_phy *phy = container_of(x, struct mxs_usb_phy, phy);
+	uint32_t val;
+
+	/* Clear the wakeup IRQ before disabling them below. */
+	writel(BM_USBPHY_CTRL_RESUME_IRQ | BM_USBPHY_CTRL_WAKEUP_IRQ,
+		x->io_priv + HW_USBPHY_CTRL_CLR);
+
+	/* Disable FS/LS compatibility and wakeup IRQs. */
+	val = BM_USBPHY_CTRL_ENUTMILEVEL2 | BM_USBPHY_CTRL_ENUTMILEVEL3 |
+		BM_USBPHY_CTRL_ENIRQWAKEUP;
+
+	/* Disable IRQ sources. */
+	val |= BM_USBPHY_CTRL_ENIDCHG_WKUP | BM_USBPHY_CTRL_ENDPDMCHG_WKUP |
+		BM_USBPHY_CTRL_ENVBUSCHG_WKUP;
+
+	writel(val, x->io_priv + HW_USBPHY_CTRL_CLR);
+
+	/*
+	 * The interrupt must be disabled for at least 3 cycles of the
+	 * standby clock (32kHz), that is 0.094 ms.
+	 */
+	udelay(100);
+
+	/* Gate off the PHY. */
+	writel(BM_USBPHY_CTRL_CLKGATE, x->io_priv + HW_USBPHY_CTRL_SET);
+
+	/* Disable clock to the PHY. */
+	clk_disable(phy->clk);
+}
+
+static int mxs_otg_set_host(struct usb_otg *otg, struct usb_bus *host)
+{
+	return 0;
+}
+
+static int mxs_otg_set_peripheral(struct usb_otg *otg, struct usb_gadget

*gg) +{

drivers/usb/otg/mxs-phy.c new file +21 -0

+	return 0;
+}
+
+static int mxs_otg_set_vbus(struct usb_otg *otg, bool enabled)
+{
+	return 0;
+}
+
+static int mxs_usb_phy_notify(struct usb_phy *x, void *data)
+{
+	struct mxs_usb_phy *phy = container_of(x, struct mxs_usb_phy, phy);
+	struct mxs_ci13xxx_phy_notify *notify = data;
+
+	if (notify->discon == phy->discon)
+		return 0;
+
+	phy->discon = notify->discon;
+
+	if (notify->discon) {
+		writel(BM_USBPHY_CTRL_ENHOSTDISCONDETECT,
+			x->io_priv + HW_USBPHY_CTRL_CLR);

drivers/usb/otg/mxs-phy.c line 175

Quoted 4 lines

drivers/usb/otg/mxs-phy.c new file +4 -0

+	} else {
+		writel(BM_USBPHY_CTRL_ENHOSTDISCONDETECT,
+			x->io_priv + HW_USBPHY_CTRL_SET);
+	}

I'm also thinking how to add the hack. Great work.
and, maybe it can be PHY_EVENT_CONNECT and PHY_EVENT_DISCONNECT rather not void* ? It makes loose binding of phy and usb driver.

Quoted 31 lines

drivers/usb/otg/mxs-phy.c new file +31 -0

+
+	return 0;
+}
+
+static int __devinit mxs_phy_probe(struct platform_device *pdev)
+{
+	struct mxs_usb_phy *phy;
+	struct resource *mem_res;
+	void *retp;
+	int ret;
+	struct usb_otg *otg;
+
+	/* Allocate PHY driver's private data. */
+	phy = devm_kzalloc(&pdev->dev, sizeof(*phy), GFP_KERNEL);
+	if (!phy) {
+		dev_err(&pdev->dev, "Failed to allocate USB PHY structure!\n");
+		return -ENOMEM;
+	}
+
+	/* Get memory area for PHY from resources. */
+	mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+	if (!mem_res) {
+		dev_err(&pdev->dev, "Specify memory area for this USB PHY!\n");
+		return -ENODEV;
+	}
+
+	/* Request the memory region for this USB PHY. */
+	retp = devm_request_mem_region(&pdev->dev, mem_res->start,
+			resource_size(mem_res), pdev->name);
+	if (!retp) {
+		dev_err(&pdev->dev, "USB PHY memory area already in use!\n");

drivers/usb/otg/mxs-phy.c line 212

Quoted 6 lines

drivers/usb/otg/mxs-phy.c new file +6 -0

+		return -EBUSY;
+	}
+
+	/* Map the memory region for USB PHY. */
+	phy->phy.io_priv = devm_ioremap(&pdev->dev, mem_res->start,
+				resource_size(mem_res));

devm_request_and_ioremap ?

drivers/usb/otg/mxs-phy.c line 219

Quoted 7 lines

drivers/usb/otg/mxs-phy.c new file +7 -0

+	if (!phy->phy.io_priv) {
+		dev_err(&pdev->dev, "Memory mapping of USB PHY failed!\n");
+		return -EFAULT;
+	}
+
+	/* Claim the PHY clock. */
+	phy->clk = clk_get(&pdev->dev, "phy");

devm_clk_get ?

drivers/usb/otg/mxs-phy.c line 226

Quoted 7 lines

drivers/usb/otg/mxs-phy.c new file +7 -0

+	if (!phy->clk) {
+		dev_err(&pdev->dev, "Failed to claim clock for USB PHY!\n");
+		return PTR_ERR(phy->clk);
+	}
+
+	/* Prepare PHY clock. */
+	ret = clk_prepare(phy->clk);

Why not put it in phy init? phy init has to be atomic?

Quoted 22 lines

drivers/usb/otg/mxs-phy.c new file +22 -0

+	if (ret) {
+		dev_err(&pdev->dev, "Failed to prepare clock for USB PHY!\n");
+		goto err_prepare_phy_clock;
+	}
+
+	/* Setup the PHY structures. */
+	phy->phy.dev		= &pdev->dev;
+	phy->phy.label		= "mxs-usb-phy";
+	phy->phy.init		= mxs_usb_phy_init;
+	phy->phy.shutdown	= mxs_usb_phy_shutdown;
+	phy->phy.notify		= mxs_usb_phy_notify;
+	phy->phy.state		= OTG_STATE_UNDEFINED;
+
+	otg			= &phy->otg;
+	phy->phy.otg		= otg;
+
+	otg->phy		= &phy->phy;
+	otg->set_vbus		= mxs_otg_set_vbus;
+	otg->set_host		= mxs_otg_set_host;
+	otg->set_peripheral	= mxs_otg_set_peripheral;
+
+	platform_set_drvdata(pdev, phy);

drivers/usb/otg/mxs-phy.c line 253

Quoted 5 lines

drivers/usb/otg/mxs-phy.c new file +5 -0

+
+	ATOMIC_INIT_NOTIFIER_HEAD(&phy->phy.notifier);
+
+	/* Register the transceiver with kernel. */
+	ret = usb_set_transceiver(&phy->phy);

In my code, I don't plan to call it for host phy, to achieve multi-phy support.

Quoted 48 lines

drivers/usb/otg/mxs-phy.c new file +48 -0

+	if (ret) {
+		dev_err(&pdev->dev, "Can't register transceiver, (%d)\n", ret);
+		goto err_set_transceiver;
+	}
+
+	return 0;
+
+err_set_transceiver:
+	clk_unprepare(phy->clk);
+err_prepare_phy_clock:
+	clk_put(phy->clk);
+	return ret;
+}
+
+static int __devexit mxs_phy_remove(struct platform_device *pdev)
+{
+	struct mxs_usb_phy *phy = platform_get_drvdata(pdev);
+
+	/* Power down the PHY. */
+	mxs_usb_phy_shutdown(&phy->phy);
+
+	/* Remove the transceiver. */
+	usb_set_transceiver(NULL);
+
+	/* Stop the PHY clock. */
+	clk_disable_unprepare(phy->clk);
+	clk_put(phy->clk);
+
+	/* Free the rest. */
+	platform_set_drvdata(pdev, NULL);
+
+	return 0;
+}
+
+static struct platform_driver mxs_phy_driver = {
+	.probe		= mxs_phy_probe,
+	.remove		= __devexit_p(mxs_phy_remove),
+	.driver		= {
+		.name	= "mxs-usb-phy",
+		.owner	= THIS_MODULE,
+	},
+};
+
+static int __init mxs_phy_init(void)
+{
+	return platform_driver_register(&mxs_phy_driver);
+}
+

drivers/usb/otg/mxs-phy.c line 307

Quoted 6 lines

drivers/usb/otg/mxs-phy.c new file +6 -0

+static void __exit mxs_phy_exit(void)
+{
+	platform_driver_unregister(&mxs_phy_driver);
+}
+
+arch_initcall(mxs_phy_init);

postcor_initcall? It make possible hack in machine init code.

Thanks
Richard

Quoted 6 lines

drivers/usb/otg/mxs-phy.c new file +6 -0

+module_exit(mxs_phy_exit);
+
+MODULE_ALIAS("platform:mxs-usb-phy");
+MODULE_AUTHOR("Marek Vasut <[email protected]>");
+MODULE_DESCRIPTION("Freescale i.MX28 USB PHY driver");
+MODULE_LICENSE("GPL");

Dear Richard Zhao,

Quoted 26 lines

Hi Marek,

Quoted 22 lines · Marek Vasut

Add driver that controls the built-in USB PHY in the i.MX233/i.MX28. This enables the PHY upon powerup and shuts it down on shutdown.

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

Cc Chen Peter-B29397 <[email protected]>

Cc Detlev Zundel <[email protected]>

Cc Fabio Estevam <[email protected]>

Cc Li Frank-B20596 <[email protected]>

Cc Linux USB <[email protected]>

Cc Liu JunJie-B08287 <[email protected]>

Cc Sascha Hauer <[email protected]>

Cc Shawn Guo <[email protected]>

Cc Shi Make-B15407 <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Subodh Nijsure <[email protected]>

Cc Wolfgang Denk <[email protected]>

---

 drivers/usb/otg/Kconfig   |   10 ++
 drivers/usb/otg/Makefile  |    1 +
 drivers/usb/otg/mxs-phy.c |  313

+++++++++++++++++++++++++++++++++++++++++++++

Quoted 1 line

imx is more common.

But is this really present also in the mx3/mx5 chips ? Or is this only mx233/mx28/mx6q specific ?

Quoted 135 lines

Quoted 135 lines

 3 files changed, 324 insertions(+)
 create mode 100644 drivers/usb/otg/mxs-phy.c

drivers/usb/otg/Kconfig +10 -0

index 5c87db0..bc7625e 100644
@@ -116,6 +116,16 @@ config FSL_USB2_OTG
 
 	help
 
 	  Enable this to support Freescale USB OTG transceiver.
 
+config USB_MXS_PHY
+	tristate "Freescale i.MX28 USB PHY support"
+	select USB_OTG_UTILS
+	select USB_IMX_COMPOSITE
+	help
+	  Say Y here if you want to build Freescale i.MX28 USB PHY
+	  driver in kernel.
+
+	  To compile this driver as a module, choose M here.
+
 

config USB_MV_OTG

drivers/usb/otg/Kconfig +0 -0

 	tristate "Marvell USB OTG support"
 	depends on USB_EHCI_MV && USB_MV_UDC && USB_SUSPEND

drivers/usb/otg/Makefile +1 -0

index 41aa509..a844b8d 100644
@@ -20,4 +20,5 @@ obj-$(CONFIG_USB_MSM_OTG)	+= msm_otg.o
 
 obj-$(CONFIG_AB8500_USB)	+= ab8500-usb.o
 fsl_usb2_otg-objs		:= fsl_otg.o otg_fsm.o
 obj-$(CONFIG_FSL_USB2_OTG)	+= fsl_usb2_otg.o
 
+obj-$(CONFIG_USB_MXS_PHY)	+= mxs-phy.o
 
 obj-$(CONFIG_USB_MV_OTG)	+= mv_otg.o

drivers/usb/otg/mxs-phy.c new file +85 -0

new file mode 100644
index 0000000..eb658ca
@@ -0,0 +1,313 @@
+/*
+ * drivers/usb/otg/mxs-phy.c
+ *
+ * Freescale i.MX28 USB PHY driver.
+ *
+ * Copyright (C) 2012 Marek Vasut <[email protected]>
+ * on behalf of DENX Software Engineering GmbH
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/dma-mapping.h>
+#include <linux/slab.h>
+#include <linux/delay.h>
+
+#include <linux/usb.h>
+#include <linux/usb/ch9.h>
+#include <linux/usb/otg.h>
+#include <linux/usb/gadget.h>
+#include <linux/usb/hcd.h>
+#include <linux/usb/ehci_def.h>
+
+#include <mach/common.h>
+#include <mach/hardware.h>
+#include <mach/devices-common.h>
+#include <mach/mx28.h>
+
+/* MXS USB PHY register definitions. */
+#define HW_USBPHY_PWD				0x00
+
+#define HW_USBPHY_CTRL				0x30
+#define HW_USBPHY_CTRL_SET			0x34
+#define HW_USBPHY_CTRL_CLR			0x38
+#define HW_USBPHY_CTRL_TOG			0x3c
+
+#define BM_USBPHY_CTRL_SFTRST			(1 << 31)
+#define BM_USBPHY_CTRL_CLKGATE			(1 << 30)
+#define BM_USBPHY_CTRL_ENVBUSCHG_WKUP		(1 << 23)
+#define BM_USBPHY_CTRL_ENIDCHG_WKUP		(1 << 22)
+#define BM_USBPHY_CTRL_ENDPDMCHG_WKUP		(1 << 21)
+#define BM_USBPHY_CTRL_WAKEUP_IRQ		(1 << 17)
+#define BM_USBPHY_CTRL_ENIRQWAKEUP		(1 << 16)
+#define BM_USBPHY_CTRL_ENUTMILEVEL3		(1 << 15)
+#define BM_USBPHY_CTRL_ENUTMILEVEL2		(1 << 14)
+#define BM_USBPHY_CTRL_ENIRQDEVPLUGIN		(1 << 11)
+#define BM_USBPHY_CTRL_RESUME_IRQ		(1 << 10)
+#define BM_USBPHY_CTRL_ENIRQRESUMEDETECT	(1 << 9)
+#define BM_USBPHY_CTRL_ENOTGIDDETECT		(1 << 7)
+#define BM_USBPHY_CTRL_ENDEVPLUGINDETECT	(1 << 4)
+#define BM_USBPHY_CTRL_HOSTDISCONDETECT_IRQ	(1 << 3)
+#define BM_USBPHY_CTRL_ENIRQHOSTDISCON		(1 << 2)
+#define BM_USBPHY_CTRL_ENHOSTDISCONDETECT	(1 << 1)
+
+#define HW_USBPHY_STATUS			0x40
+
+#define BM_USBPHY_STATUS_OTGID_STATUS		(1 << 8)
+#define BM_USBPHY_STATUS_DEVPLUGIN_STATUS	(1 << 6)
+#define BM_USBPHY_STATUS_HOSTDISCON_STATUS	(1 << 3)
+
+struct mxs_usb_phy {
+	struct usb_phy		phy;
+	struct usb_otg		otg;
+	struct clk		*clk;
+	bool			discon;
+};
+
+static int mxs_usb_phy_init(struct usb_phy *x)
+{
+	struct mxs_usb_phy *phy = container_of(x, struct mxs_usb_phy, phy);
+	uint32_t val;
+

Quoted 8 lines

drivers/usb/otg/mxs-phy.c line 90

Quoted 5 lines

drivers/usb/otg/mxs-phy.c new file +5 -0

+	/* Enable clock to the PHY. */
+	clk_enable(phy->clk);
+
+	/* Reset the PHY block. */
+	mxs_reset_block(x->io_priv + HW_USBPHY_CTRL);

I find mxs_reset_block is defined in platform code. It breaks multi-soc in one image.

This is a matter to change I believe ... with the SMTP-device stuff from Wolfram. Check my comment on your PHY patch.

Quoted 11 lines

Quoted 11 lines

drivers/usb/otg/mxs-phy.c new file +10 -0

+
+	/* Power up the PHY. */
+	writel(0, x->io_priv + HW_USBPHY_PWD);
+
+	/* Clear the wakeup IRQ before enabling them below. */
+	writel(BM_USBPHY_CTRL_RESUME_IRQ | BM_USBPHY_CTRL_WAKEUP_IRQ,
+		x->io_priv + HW_USBPHY_CTRL_CLR);
+
+	/* Enable FS/LS compatibility and wakeup IRQs. */
+	val = BM_USBPHY_CTRL_ENUTMILEVEL2 | BM_USBPHY_CTRL_ENUTMILEVEL3 |

Quoted 8 lines

drivers/usb/otg/mxs-phy.c line 105

Quoted 5 lines

drivers/usb/otg/mxs-phy.c new file +5 -0

+		BM_USBPHY_CTRL_ENIRQWAKEUP;
+
+	/* Enable IRQ sources. */
+	val |= BM_USBPHY_CTRL_ENIDCHG_WKUP | BM_USBPHY_CTRL_ENDPDMCHG_WKUP |
+		BM_USBPHY_CTRL_ENVBUSCHG_WKUP;

It's a little different from my steps. I copied it from fsl kernel. Peter, maybe you can comment?

You need to enable these to get wakeup interrupts from the PHY.

Quoted 67 lines

Quoted 67 lines

drivers/usb/otg/mxs-phy.c new file +44 -0

+
+	writel(val, x->io_priv + HW_USBPHY_CTRL_SET);
+
+	return 0;
+}
+
+static void mxs_usb_phy_shutdown(struct usb_phy *x)
+{
+	struct mxs_usb_phy *phy = container_of(x, struct mxs_usb_phy, phy);
+	uint32_t val;
+
+	/* Clear the wakeup IRQ before disabling them below. */
+	writel(BM_USBPHY_CTRL_RESUME_IRQ | BM_USBPHY_CTRL_WAKEUP_IRQ,
+		x->io_priv + HW_USBPHY_CTRL_CLR);
+
+	/* Disable FS/LS compatibility and wakeup IRQs. */
+	val = BM_USBPHY_CTRL_ENUTMILEVEL2 | BM_USBPHY_CTRL_ENUTMILEVEL3 |
+		BM_USBPHY_CTRL_ENIRQWAKEUP;
+
+	/* Disable IRQ sources. */
+	val |= BM_USBPHY_CTRL_ENIDCHG_WKUP | BM_USBPHY_CTRL_ENDPDMCHG_WKUP |
+		BM_USBPHY_CTRL_ENVBUSCHG_WKUP;
+
+	writel(val, x->io_priv + HW_USBPHY_CTRL_CLR);
+
+	/*
+	 * The interrupt must be disabled for at least 3 cycles of the
+	 * standby clock (32kHz), that is 0.094 ms.
+	 */
+	udelay(100);
+
+	/* Gate off the PHY. */
+	writel(BM_USBPHY_CTRL_CLKGATE, x->io_priv + HW_USBPHY_CTRL_SET);
+
+	/* Disable clock to the PHY. */
+	clk_disable(phy->clk);
+}
+
+static int mxs_otg_set_host(struct usb_otg *otg, struct usb_bus *host)
+{
+	return 0;
+}
+
+static int mxs_otg_set_peripheral(struct usb_otg *otg, struct usb_gadget

*gg) +{

drivers/usb/otg/mxs-phy.c new file +21 -0

+	return 0;
+}
+
+static int mxs_otg_set_vbus(struct usb_otg *otg, bool enabled)
+{
+	return 0;
+}
+
+static int mxs_usb_phy_notify(struct usb_phy *x, void *data)
+{
+	struct mxs_usb_phy *phy = container_of(x, struct mxs_usb_phy, phy);
+	struct mxs_ci13xxx_phy_notify *notify = data;
+
+	if (notify->discon == phy->discon)
+		return 0;
+
+	phy->discon = notify->discon;
+
+	if (notify->discon) {
+		writel(BM_USBPHY_CTRL_ENHOSTDISCONDETECT,
+			x->io_priv + HW_USBPHY_CTRL_CLR);

Quoted 8 lines

drivers/usb/otg/mxs-phy.c line 175

Quoted 4 lines

drivers/usb/otg/mxs-phy.c new file +4 -0

+	} else {
+		writel(BM_USBPHY_CTRL_ENHOSTDISCONDETECT,
+			x->io_priv + HW_USBPHY_CTRL_SET);
+	}

I'm also thinking how to add the hack. Great work.
and, maybe it can be PHY_EVENT_CONNECT and PHY_EVENT_DISCONNECT rather not void* ? It makes loose binding of phy and usb driver.

Correct, we discussed this with Greg and Alan (CCed)

Quoted 31 lines

Quoted 31 lines

drivers/usb/otg/mxs-phy.c new file +31 -0

+
+	return 0;
+}
+
+static int __devinit mxs_phy_probe(struct platform_device *pdev)
+{
+	struct mxs_usb_phy *phy;
+	struct resource *mem_res;
+	void *retp;
+	int ret;
+	struct usb_otg *otg;
+
+	/* Allocate PHY driver's private data. */
+	phy = devm_kzalloc(&pdev->dev, sizeof(*phy), GFP_KERNEL);
+	if (!phy) {
+		dev_err(&pdev->dev, "Failed to allocate USB PHY structure!\n");
+		return -ENOMEM;
+	}
+
+	/* Get memory area for PHY from resources. */
+	mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+	if (!mem_res) {
+		dev_err(&pdev->dev, "Specify memory area for this USB PHY!\n");
+		return -ENODEV;
+	}
+
+	/* Request the memory region for this USB PHY. */
+	retp = devm_request_mem_region(&pdev->dev, mem_res->start,
+			resource_size(mem_res), pdev->name);
+	if (!retp) {
+		dev_err(&pdev->dev, "USB PHY memory area already in use!\n");

Quoted 8 lines

drivers/usb/otg/mxs-phy.c line 212

Quoted 6 lines

drivers/usb/otg/mxs-phy.c new file +6 -0

+		return -EBUSY;
+	}
+
+	/* Map the memory region for USB PHY. */
+	phy->phy.io_priv = devm_ioremap(&pdev->dev, mem_res->start,
+				resource_size(mem_res));

devm_request_and_ioremap ?

Yes, should be like that. But now, we need to figure out what driver to use and how to compose the final thingie from your and mine code.

Quoted 10 lines

drivers/usb/otg/mxs-phy.c line 219

Quoted 8 lines

drivers/usb/otg/mxs-phy.c new file +7 -0

+	if (!phy->phy.io_priv) {
+		dev_err(&pdev->dev, "Memory mapping of USB PHY failed!\n");
+		return -EFAULT;
+	}
+
+	/* Claim the PHY clock. */
+	phy->clk = clk_get(&pdev->dev, "phy");

devm_clk_get ?

yes, thanks!

Quoted 9 lines

drivers/usb/otg/mxs-phy.c line 226

Quoted 7 lines

drivers/usb/otg/mxs-phy.c new file +7 -0

+	if (!phy->clk) {
+		dev_err(&pdev->dev, "Failed to claim clock for USB PHY!\n");
+		return PTR_ERR(phy->clk);
+	}
+
+	/* Prepare PHY clock. */
+	ret = clk_prepare(phy->clk);

Why not put it in phy init? phy init has to be atomic?

I think moving this to phy init would be OK, yes.

Quoted 22 lines

Quoted 22 lines

drivers/usb/otg/mxs-phy.c new file +22 -0

+	if (ret) {
+		dev_err(&pdev->dev, "Failed to prepare clock for USB PHY!\n");
+		goto err_prepare_phy_clock;
+	}
+
+	/* Setup the PHY structures. */
+	phy->phy.dev		= &pdev->dev;
+	phy->phy.label		= "mxs-usb-phy";
+	phy->phy.init		= mxs_usb_phy_init;
+	phy->phy.shutdown	= mxs_usb_phy_shutdown;
+	phy->phy.notify		= mxs_usb_phy_notify;
+	phy->phy.state		= OTG_STATE_UNDEFINED;
+
+	otg			= &phy->otg;
+	phy->phy.otg		= otg;
+
+	otg->phy		= &phy->phy;
+	otg->set_vbus		= mxs_otg_set_vbus;
+	otg->set_host		= mxs_otg_set_host;
+	otg->set_peripheral	= mxs_otg_set_peripheral;
+
+	platform_set_drvdata(pdev, phy);

Quoted 8 lines

drivers/usb/otg/mxs-phy.c line 253

Quoted 5 lines

drivers/usb/otg/mxs-phy.c new file +5 -0

+
+	ATOMIC_INIT_NOTIFIER_HEAD(&phy->phy.notifier);
+
+	/* Register the transceiver with kernel. */
+	ret = usb_set_transceiver(&phy->phy);

In my code, I don't plan to call it for host phy, to achieve multi-phy support.

We're not sure how the multi-phy support will look like at all yet. I think Peter and Filipe are in a tough dispute on that.

Quoted 49 lines

Quoted 49 lines

drivers/usb/otg/mxs-phy.c new file +48 -0

+	if (ret) {
+		dev_err(&pdev->dev, "Can't register transceiver, (%d)\n", ret);
+		goto err_set_transceiver;
+	}
+
+	return 0;
+
+err_set_transceiver:
+	clk_unprepare(phy->clk);
+err_prepare_phy_clock:
+	clk_put(phy->clk);
+	return ret;
+}
+
+static int __devexit mxs_phy_remove(struct platform_device *pdev)
+{
+	struct mxs_usb_phy *phy = platform_get_drvdata(pdev);
+
+	/* Power down the PHY. */
+	mxs_usb_phy_shutdown(&phy->phy);
+
+	/* Remove the transceiver. */
+	usb_set_transceiver(NULL);
+
+	/* Stop the PHY clock. */
+	clk_disable_unprepare(phy->clk);
+	clk_put(phy->clk);
+
+	/* Free the rest. */
+	platform_set_drvdata(pdev, NULL);
+
+	return 0;
+}
+
+static struct platform_driver mxs_phy_driver = {
+	.probe		= mxs_phy_probe,
+	.remove		= __devexit_p(mxs_phy_remove),
+	.driver		= {
+		.name	= "mxs-usb-phy",
+		.owner	= THIS_MODULE,
+	},
+};
+
+static int __init mxs_phy_init(void)
+{
+	return platform_driver_register(&mxs_phy_driver);
+}
+

Quoted 8 lines

drivers/usb/otg/mxs-phy.c line 307

Quoted 6 lines

drivers/usb/otg/mxs-phy.c new file +6 -0

+static void __exit mxs_phy_exit(void)
+{
+	platform_driver_unregister(&mxs_phy_driver);
+}
+
+arch_initcall(mxs_phy_init);

postcor_initcall? It make possible hack in machine init code.

Good idea.

Thanks for the review, now how should we put these codes of ours together? Will you integrate my code into yours or shall I do it the other way around?

Alas, I'd prefer for the PHY to stay separate in drivers/usb/otg,

maybe we can
also recycle some my mxs binding code for ci13xxx in some way or another, as it has MXS specific hacks in it.

I think the ci13xxx binding for the rest of i.MX
(aka mxc) will looks different, won't it? But either way, my mxs/ci13xxx binding glue will have to wait until we finish negotiating the phy_notify stuff with Greg.

Quoted 10 lines

Thanks
Richard

Quoted 6 lines

drivers/usb/otg/mxs-phy.c new file +6 -0

+module_exit(mxs_phy_exit);
+
+MODULE_ALIAS("platform:mxs-usb-phy");
+MODULE_AUTHOR("Marek Vasut <[email protected]>");
+MODULE_DESCRIPTION("Freescale i.MX28 USB PHY driver");
+MODULE_LICENSE("GPL");

Quoted 2 lines

Thanks for the review, now how should we put these codes of ours together? Will you integrate my code into yours or shall I do it the other way around?

either way works for me. but I hope it support imx6 and use DT bindings and other things maybe in next branch.

Quoted 2 lines

Alas, I'd prefer for the PHY to stay separate in drivers/usb/otg,

I explained it above.

Quoted 3 lines

maybe we can
also recycle some my mxs binding code for ci13xxx in some way or another, as it has MXS specific hacks in it.

what hack do you mean?

Quoted 4 lines

I think the ci13xxx binding for the rest of i.MX
(aka mxc) will looks different, won't it? But either way, my mxs/ci13xxx binding glue will have to wait until we finish negotiating the phy_notify stuff with Greg.

Sure. At the same time, we may create new version patch and see response.

Thanks
Richard

Quoted 11 lines

Quoted 10 lines

Thanks
Richard

drivers/usb/otg/mxs-phy.c line 313

Quoted 6 lines

drivers/usb/otg/mxs-phy.c new file +6 -0

+module_exit(mxs_phy_exit);
+
+MODULE_ALIAS("platform:mxs-usb-phy");
+MODULE_AUTHOR("Marek Vasut <[email protected]>");
+MODULE_DESCRIPTION("Freescale i.MX28 USB PHY driver");
+MODULE_LICENSE("GPL");

--
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

Quoted 6 lines

Quoted 3 lines

Thanks for the review, now how should we put these codes of ours together? Will you integrate my code into yours or shall I do it the other way around?

either way works for me. but I hope it support imx6 and use DT bindings and other things maybe in next branch.

Since, anyway we have to use DT, do you mind if I pick your patch and add mx28 DT too, and send you for further tuning?

Thanks
Richard

Quoted 34 lines

Quoted 1 line

Alas, I'd prefer for the PHY to stay separate in drivers/usb/otg,

I explained it above.

Quoted 3 lines

maybe we can
also recycle some my mxs binding code for ci13xxx in some way or another, as it has MXS specific hacks in it.

what hack do you mean?

Quoted 4 lines

I think the ci13xxx binding for the rest of i.MX
(aka mxc) will looks different, won't it? But either way, my mxs/ci13xxx binding glue will have to wait until we finish negotiating the phy_notify stuff with Greg.

Sure. At the same time, we may create new version patch and see response.

Thanks
Richard

Quoted 9 lines

Quoted 9 lines

Thanks
Richard

drivers/usb/otg/mxs-phy.c line 313

Quoted 6 lines

drivers/usb/otg/mxs-phy.c new file +6 -0

+module_exit(mxs_phy_exit);
+
+MODULE_ALIAS("platform:mxs-usb-phy");
+MODULE_AUTHOR("Marek Vasut <[email protected]>");
+MODULE_DESCRIPTION("Freescale i.MX28 USB PHY driver");
+MODULE_LICENSE("GPL");

--
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

Quoted 28 lines

Dear Richard Zhao,

Quoted 26 lines

Hi Marek,

Quoted 22 lines · Marek Vasut

Add driver that controls the built-in USB PHY in the i.MX233/i.MX28. This enables the PHY upon powerup and shuts it down on shutdown.

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

Cc Chen Peter-B29397 <[email protected]>

Cc Detlev Zundel <[email protected]>

Cc Fabio Estevam <[email protected]>

Cc Li Frank-B20596 <[email protected]>

Cc Linux USB <[email protected]>

Cc Liu JunJie-B08287 <[email protected]>

Cc Sascha Hauer <[email protected]>

Cc Shawn Guo <[email protected]>

Cc Shi Make-B15407 <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Subodh Nijsure <[email protected]>

Cc Wolfgang Denk <[email protected]>

---

 drivers/usb/otg/Kconfig   |   10 ++
 drivers/usb/otg/Makefile  |    1 +
 drivers/usb/otg/mxs-phy.c |  313

+++++++++++++++++++++++++++++++++++++++++++++

Quoted 4 lines

Quoted 1 line

imx is more common.

But is this really present also in the mx3/mx5 chips ? Or is this only mx233/mx28/mx6q specific ?

I don't mean phy only, but all naming in the series. mx23/28 (mxs) are still imx.

Quoted 15 lines

Quoted 6 lines

Quoted 6 lines

drivers/usb/otg/mxs-phy.c new file +6 -0

+	otg->phy		= &phy->phy;
+	otg->set_vbus		= mxs_otg_set_vbus;
+	otg->set_host		= mxs_otg_set_host;
+	otg->set_peripheral	= mxs_otg_set_peripheral;
+
+	platform_set_drvdata(pdev, phy);

Quoted 8 lines

drivers/usb/otg/mxs-phy.c line 253

Quoted 5 lines

drivers/usb/otg/mxs-phy.c new file +5 -0

+
+	ATOMIC_INIT_NOTIFIER_HEAD(&phy->phy.notifier);
+
+	/* Register the transceiver with kernel. */
+	ret = usb_set_transceiver(&phy->phy);

In my code, I don't plan to call it for host phy, to achieve multi-phy support.

Quoted 2 lines

We're not sure how the multi-phy support will look like at all yet. I think Peter and Filipe are in a tough dispute on that.

Using DT phandler, my code can connect phy and usb drivers. We might not have to pend on phy lib.
Sure, somehow it cause dependency between phy driver and ci13xxx_imx driver. phy driver must set usb_phy as drv data and ci13xxx_imx use it. It's one reason why I didn't put it to otg folder. The other reason is, otg folder may not be a good place to hold phy. Maybe drivers/usb/phy will be better?

Quoted 9 lines

Quoted 8 lines

drivers/usb/otg/mxs-phy.c line 307

Quoted 6 lines

drivers/usb/otg/mxs-phy.c new file +6 -0

+static void __exit mxs_phy_exit(void)
+{
+	platform_driver_unregister(&mxs_phy_driver);
+}
+
+arch_initcall(mxs_phy_init);

postcor_initcall? It make possible hack in machine init code.

Quoted 5 lines

Good idea.

Thanks for the review, now how should we put these codes of ours together? Will you integrate my code into yours or shall I do it the other way around?

either way works for me. but I hope it support imx6 and use DT bindings and other things maybe in next branch.

Quoted 1 line

Alas, I'd prefer for the PHY to stay separate in drivers/usb/otg,

I explained it above.

Quoted 3 lines

maybe we can
also recycle some my mxs binding code for ci13xxx in some way or another, as it has MXS specific hacks in it.

what hack do you mean?

Quoted 4 lines

I think the ci13xxx binding for the rest of i.MX
(aka mxc) will looks different, won't it? But either way, my mxs/ci13xxx binding glue will have to wait until we finish negotiating the phy_notify stuff with Greg.

Sure. At the same time, we may create new version patch and see response.

Thanks
Richard

Quoted 9 lines

Quoted 9 lines

Thanks
Richard

Quoted 6 lines

drivers/usb/otg/mxs-phy.c new file +6 -0

+module_exit(mxs_phy_exit);
+
+MODULE_ALIAS("platform:mxs-usb-phy");
+MODULE_AUTHOR("Marek Vasut <[email protected]>");
+MODULE_DESCRIPTION("Freescale i.MX28 USB PHY driver");
+MODULE_LICENSE("GPL");

Add driver that controls the built-in USB PHY in the i.MX233/i.MX28. This enables the PHY upon powerup and shuts it down on shutdown.

+ *
+ * Freescale i.MX28 USB PHY driver.

drivers/usb/otg/mxs-phy.c new file +4 -0

+
+	writel(val, x->io_priv + HW_USBPHY_CTRL_SET);
+
+	return 0;

+MODULE_LICENSE("GPL");

Signature · 1 line

1.7.10

Quoted 2 lines

Add driver that controls the built-in USB PHY in the i.MX233/i.MX28. This enables the PHY upon powerup and shuts it down on shutdown.

Please add i.mx6q .

drivers/usb/otg/Kconfig config FSL_USB2_OTG · line 122

Quoted 4 lines

drivers/usb/otg/Kconfig +4 -0

+config USB_MXS_PHY
+	tristate "Freescale i.MX28 USB PHY support"
+	select USB_OTG_UTILS
+	select USB_IMX_COMPOSITE

Seems you will not use imx_otg.c with chipidea framework.

Quoted 3 lines

+ *
+ * Freescale i.MX28 USB PHY driver.

use mxs

drivers/usb/otg/mxs-phy.c line 105

Quoted 9 lines

+ *

drivers/usb/otg/mxs-phy.c new file +8 -0

+
+	/* Enable FS/LS compatibility and wakeup IRQs. */
+	val = BM_USBPHY_CTRL_ENUTMILEVEL2 | BM_USBPHY_CTRL_ENUTMILEVEL3 |
+		BM_USBPHY_CTRL_ENIRQWAKEUP;
+
+	/* Enable IRQ sources. */
+	val |= BM_USBPHY_CTRL_ENIDCHG_WKUP | BM_USBPHY_CTRL_ENDPDMCHG_WKUP |
+		BM_USBPHY_CTRL_ENVBUSCHG_WKUP;

Please forget wakeup function currently, as it will make things more complicated.

Quoted 4 lines

drivers/usb/otg/mxs-phy.c new file +4 -0

+
+	writel(val, x->io_priv + HW_USBPHY_CTRL_SET);
+
+	return 0;

drivers/usb/otg/mxs-phy.c line 128

Quoted 10 lines

drivers/usb/otg/mxs-phy.c new file +10 -0

+}
+
+	/* Disable FS/LS compatibility and wakeup IRQs. */
+	val = BM_USBPHY_CTRL_ENUTMILEVEL2 | BM_USBPHY_CTRL_ENUTMILEVEL3 |
+		BM_USBPHY_CTRL_ENIRQWAKEUP;
+
+	/* Disable IRQ sources. */
+	val |= BM_USBPHY_CTRL_ENIDCHG_WKUP | BM_USBPHY_CTRL_ENDPDMCHG_WKUP |
+		BM_USBPHY_CTRL_ENVBUSCHG_WKUP;
+

The same with above

drivers/usb/otg/mxs-phy.c line 312

Quoted 4 lines

drivers/usb/otg/mxs-phy.c new file +4 -0

+
+MODULE_ALIAS("platform:mxs-usb-phy");
+MODULE_AUTHOR("Marek Vasut <[email protected]>");
+MODULE_DESCRIPTION("Freescale i.MX28 USB PHY driver");

mxs

Quoted 1 line

+MODULE_LICENSE("GPL");

This codes connects the CI13xxx driver with the core found inside of the Freescale i.MX244/i.MX28 CPU.

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

Cc Alan Stern <[email protected]>

Cc Detlev Zundel <[email protected]>

CC Dong Aisheng <[email protected]>

CC Fabio Estevam <[email protected]>

Cc Felipe Balbi <[email protected]>

Cc Greg Kroah-Hartman <[email protected]>

Cc Linux ARM kernel <[email protected]>

Cc linux-i2c at vger.kernel.org

CC Sascha Hauer <[email protected]>

CC Shawn Guo <[email protected]>

Cc Stefano Babic <[email protected]>

CC Uwe Kleine-K?nig <[email protected]>

Cc Wolfgang Denk <[email protected]>

Cc Wolfram Sang <[email protected]>

---
 drivers/usb/chipidea/Makefile      |    4 +
 drivers/usb/chipidea/ci13xxx_mxs.c |  201 ++++++++++++++++++++++++++++++++++++
 2 files changed, 205 insertions(+)
 create mode 100644 drivers/usb/chipidea/ci13xxx_mxs.c

drivers/usb/chipidea/Makefile +0 -0

index cc34937..266d57d 100644

drivers/usb/chipidea/ci13xxx_mxs.c new file +107 -0

new file mode 100644
index 0000000..fcca90b
@@ -0,0 +1,201 @@
+/*
+ * drivers/usb/chipidea/ci13xxx_mxs.c
+ *
+ * Freescale i.MX233/i.MX28 USB glue driver to CI13xxx core.
+ *
+ * Copyright (C) 2012 Marek Vasut <[email protected]>
+ * on behalf of DENX Software Engineering GmbH
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
+#include <linux/clk.h>
+#include <linux/dma-mapping.h>
+
+#include <linux/usb.h>
+#include <linux/usb/chipidea.h>
+#include <linux/usb/ch9.h>
+#include <linux/usb/otg.h>
+#include <linux/usb/gadget.h>
+#include <linux/usb/hcd.h>
+#include <linux/usb/ehci_def.h>
+
+#include <linux/usb/mxs-usb.h>
+
+#include "ci.h"
+
+static void ci13xxx_mxs_notify(struct ci13xxx *ci, unsigned event)
+{
+	uint32_t status;
+	struct usb_phy *phy;
+	struct mxs_ci13xxx_phy_notify notify;
+
+	phy = usb_get_transceiver();
+	if (!phy)
+		return;
+
+	if (event != CI13XXX_CONTROLLER_HOST_IRQ_EVENT)
+		return;
+
+	status = hw_read(ci, OP_USBSTS, ~0);
+
+	notify.discon = status & STS_PCD;
+
+	usb_phy_notify(phy, &notify);
+}
+
+static struct ci13xxx_udc_driver ci13xxx_mxs_udc_driver = {
+	.name			= "ci13xxx_mxs",
+	.flags			= /*CI13XXX_REGS_SHARED |*/
+				  CI13XXX_REQUIRE_TRANSCEIVER |
+				  CI13XXX_PULLUP_ON_VBUS |
+				  CI13XXX_DISABLE_STREAMING,
+	.capoffset		= 0x100,
+	.notify_event		= ci13xxx_mxs_notify,
+};
+
+struct ci13xxx_mxs_data {
+	struct clk		*clk;
+	struct platform_device	*pdev;
+};
+
+static int __devinit ci13xxx_mxs_probe(struct platform_device *pdev)
+{
+	struct ci13xxx_mxs_data *data;
+	int ret;
+	struct usb_phy *phy;
+
+	phy = usb_get_transceiver();
+	if (!phy)
+		return -EPROBE_DEFER;
+
+	data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
+	if (!data) {
+		dev_err(&pdev->dev, "Failed to allocate CI13xxx-MXS data!\n");
+		return -ENOMEM;
+	}
+
+	ret = usb_phy_init(phy);
+	if (ret) {
+		dev_err(&pdev->dev, "Failed to initialize PHY!\n");
+		return -EINVAL;
+	}
+
+	data->pdev = platform_device_alloc("ci_hdrc", -1);
+	if (!data->pdev) {
+		dev_err(&pdev->dev,
+			"Failed to allocate ci_hdrc platform device!\n");
+		ret = -ENOMEM;
+		goto put_phy;
+	}
+
+	/* Add DMA mask */

Quoted 35 lines

This codes connects the CI13xxx driver with the core found inside of the Freescale i.MX244/i.MX28 CPU.

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

Cc Alan Stern <[email protected]>

Cc Detlev Zundel <[email protected]>

CC Dong Aisheng <[email protected]>

CC Fabio Estevam <[email protected]>

Cc Felipe Balbi <[email protected]>

Cc Greg Kroah-Hartman <[email protected]>

Cc Linux ARM kernel <[email protected]>

Cc linux-i2c at vger.kernel.org

CC Sascha Hauer <[email protected]>

CC Shawn Guo <[email protected]>

Cc Stefano Babic <[email protected]>

CC Uwe Kleine-K?nig <[email protected]>

Cc Wolfgang Denk <[email protected]>

Cc Wolfram Sang <[email protected]>

---

 drivers/usb/chipidea/Makefile      |    4 +
 drivers/usb/chipidea/ci13xxx_mxs.c |  201
 ++++++++++++++++++++++++++++++++++++ 2 files changed, 205 insertions(+)
 create mode 100644 drivers/usb/chipidea/ci13xxx_mxs.c

(quoted diff) +0 -0

b/drivers/usb/chipidea/Makefile index cc34937..266d57d 100644

drivers/usb/chipidea/Makefile +0 -0

@@ -12,3 +12,7 @@ endif
 
 ifneq ($(CONFIG_ARCH_MSM),)
 
 	obj-$(CONFIG_USB_CHIPIDEA)	+= ci13xxx_msm.o

drivers/usb/chipidea/Makefile endif · line 18

Quoted 6 lines

endif

drivers/usb/chipidea/Makefile +4 -0

+
+ifneq ($(CONFIG_ARCH_MXS),)
+	obj-$(CONFIG_USB_CHIPIDEA)	+= ci13xxx_mxs.o
+endif

NAK... let it compile everywhere.

Quoted 117 lines

(quoted diff) +0 -0

b/drivers/usb/chipidea/ci13xxx_mxs.c new file mode 100644 index 0000000..fcca90b

drivers/usb/chipidea/ci13xxx_mxs.c new file +111 -0

@@ -0,0 +1,201 @@
+/*
+ * drivers/usb/chipidea/ci13xxx_mxs.c
+ *
+ * Freescale i.MX233/i.MX28 USB glue driver to CI13xxx core.
+ *
+ * Copyright (C) 2012 Marek Vasut <[email protected]>
+ * on behalf of DENX Software Engineering GmbH
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
+#include <linux/clk.h>
+#include <linux/dma-mapping.h>
+
+#include <linux/usb.h>
+#include <linux/usb/chipidea.h>
+#include <linux/usb/ch9.h>
+#include <linux/usb/otg.h>
+#include <linux/usb/gadget.h>
+#include <linux/usb/hcd.h>
+#include <linux/usb/ehci_def.h>
+
+#include <linux/usb/mxs-usb.h>
+
+#include "ci.h"
+
+static void ci13xxx_mxs_notify(struct ci13xxx *ci, unsigned event)
+{
+	uint32_t status;
+	struct usb_phy *phy;
+	struct mxs_ci13xxx_phy_notify notify;
+
+	phy = usb_get_transceiver();
+	if (!phy)
+		return;
+
+	if (event != CI13XXX_CONTROLLER_HOST_IRQ_EVENT)
+		return;
+
+	status = hw_read(ci, OP_USBSTS, ~0);
+
+	notify.discon = status & STS_PCD;
+
+	usb_phy_notify(phy, &notify);
+}
+
+static struct ci13xxx_udc_driver ci13xxx_mxs_udc_driver = {
+	.name			= "ci13xxx_mxs",
+	.flags			= /*CI13XXX_REGS_SHARED |*/
+				  CI13XXX_REQUIRE_TRANSCEIVER |
+				  CI13XXX_PULLUP_ON_VBUS |
+				  CI13XXX_DISABLE_STREAMING,
+	.capoffset		= 0x100,
+	.notify_event		= ci13xxx_mxs_notify,
+};
+
+struct ci13xxx_mxs_data {
+	struct clk		*clk;
+	struct platform_device	*pdev;
+};
+
+static int __devinit ci13xxx_mxs_probe(struct platform_device *pdev)
+{
+	struct ci13xxx_mxs_data *data;
+	int ret;
+	struct usb_phy *phy;
+
+	phy = usb_get_transceiver();
+	if (!phy)
+		return -EPROBE_DEFER;
+
+	data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
+	if (!data) {
+		dev_err(&pdev->dev, "Failed to allocate CI13xxx-MXS data!\n");
+		return -ENOMEM;
+	}
+
+	ret = usb_phy_init(phy);
+	if (ret) {
+		dev_err(&pdev->dev, "Failed to initialize PHY!\n");
+		return -EINVAL;
+	}
+
+	data->pdev = platform_device_alloc("ci_hdrc", -1);
+	if (!data->pdev) {
+		dev_err(&pdev->dev,
+			"Failed to allocate ci_hdrc platform device!\n");
+		ret = -ENOMEM;
+		goto put_phy;
+	}
+
+	/* Add DMA mask */
+	data->pdev->dev.dma_mask = devm_kzalloc(&pdev->dev,
+					sizeof(*data->pdev->dev.dma_mask),
+					GFP_KERNEL);
+	if (!data->pdev->dev.dma_mask) {

drivers/usb/chipidea/ci13xxx_mxs.c line 117

Quoted 6 lines

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

+		ret = -ENOMEM;
+		goto put_platform;
+	}
+
+	*data->pdev->dev.dma_mask = DMA_BIT_MASK(32);
+	data->pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);

why don't you just point to the parent's ?

Dear Felipe Balbi,

Quoted 36 lines · Marek Vasut

Quoted 35 lines

This codes connects the CI13xxx driver with the core found inside of the Freescale i.MX244/i.MX28 CPU.

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

Cc Alan Stern <[email protected]>

Cc Detlev Zundel <[email protected]>

CC Dong Aisheng <[email protected]>

CC Fabio Estevam <[email protected]>

Cc Felipe Balbi <[email protected]>

Cc Greg Kroah-Hartman <[email protected]>

Cc Linux ARM kernel <[email protected]>

Cc linux-i2c at vger.kernel.org

CC Sascha Hauer <[email protected]>

CC Shawn Guo <[email protected]>

Cc Stefano Babic <[email protected]>

CC Uwe Kleine-K?nig <[email protected]>

Cc Wolfgang Denk <[email protected]>

Cc Wolfram Sang <[email protected]>

---

 drivers/usb/chipidea/Makefile      |    4 +
 drivers/usb/chipidea/ci13xxx_mxs.c |  201
 ++++++++++++++++++++++++++++++++++++ 2 files changed, 205 insertions(+)
 create mode 100644 drivers/usb/chipidea/ci13xxx_mxs.c

(quoted diff) +0 -0

b/drivers/usb/chipidea/Makefile index cc34937..266d57d 100644

drivers/usb/chipidea/Makefile +0 -0

@@ -12,3 +12,7 @@ endif
 
 ifneq ($(CONFIG_ARCH_MSM),)
 
 	obj-$(CONFIG_USB_CHIPIDEA)	+= ci13xxx_msm.o

Quoted 8 lines

drivers/usb/chipidea/Makefile endif · line 18

Quoted 6 lines

endif

drivers/usb/chipidea/Makefile +4 -0

+
+ifneq ($(CONFIG_ARCH_MXS),)
+	obj-$(CONFIG_USB_CHIPIDEA)	+= ci13xxx_mxs.o
+endif

NAK... let it compile everywhere.

I just followed the pattern here, honestly I think this is quite OK so far. Further improvements can be made indeed.

Quoted 4 lines

drivers/usb/chipidea/Makefile

Quoted 2 lines

drivers/usb/chipidea/Makefile +2 -0

+	*data->pdev->dev.dma_mask = DMA_BIT_MASK(32);
+	data->pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);

why don't you just point to the parent's ?

Good idea, thanks :)