[PATCH 0/5 RESEND] ARM: OMAP: TLL driver implementation for USB host driver

[PATCH 0/5 RESEND] ARM: OMAP: TLL driver implementation for USB host driver

[Keshava Munegowda]

From: Keshava Munegowda <Keshava_mgowda-l0cyMroinI0@public.gmane.org>

The TLL configuration is removed from the UHH driver and implemented as
a seperate platform driver. Now, the UHH driver configures the TLL
through API's exported by the TLL platform driver. The TLL is an 
has independent hardware mod structure for in OMAP3 and later chips, 
hence an dedicated platform driver is created.

Signed-off-by: Keshava Munegowda <keshava_mgowda-l0cyMroinI0@public.gmane.org>

Keshava Munegowda (5):
  ARM: OMAP: USB: HOST TLL platform driver
  ARM: OMAP: USB: Build the USB HOST TLL omap device
  ARM: OMAP: USB: Remove TLL specific code
  ARM: OMAP: USB: Invoke the TLL driver from USB HS core driver
  ARM: OMAP: change the USB TLL clocks device name

 arch/arm/mach-omap2/clock3xxx_data.c  |    8 +-
 arch/arm/mach-omap2/clock44xx_data.c  |    4 +-
 arch/arm/mach-omap2/usb-host.c        |   28 ++-
 arch/arm/plat-omap/include/plat/usb.h |    9 +
 drivers/mfd/Kconfig                   |    2 +-
 drivers/mfd/Makefile                  |    2 +-
 drivers/mfd/omap-usb-host.c           |  232 +----------------
 drivers/mfd/omap-usb-tll.c            |  463 +++++++++++++++++++++++++++++++++
 8 files changed, 513 insertions(+), 235 deletions(-)
 create mode 100644 drivers/mfd/omap-usb-tll.c

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

[PATCH 1/5 RESEND] ARM: OMAP: USB: HOST TLL platform driver

[Keshava Munegowda]

From: Keshava Munegowda <Keshava_mgowda@ti.com>

The platform driver for the TLL component of the OMAP USB host controller
is implemented. Depending on the TLL hardware revision , the TLL channels
are configured. The USB HS core driver uses this driver through exported
APIs from the TLL platform driver.
usb_tll_enable and usb_tll_disble are the exported APIs of the USB TLL
platform driver.

Signed-off-by: Keshava Munegowda <keshava_mgowda@ti.com>
Reviewed-by: Partha Basak <parthab@india.ti.com>
---
 arch/arm/plat-omap/include/plat/usb.h |    8 +
 drivers/mfd/Kconfig                   |    2 +-
 drivers/mfd/Makefile                  |    2 +-
 drivers/mfd/omap-usb-tll.c            |  463 +++++++++++++++++++++++++++++++++
 4 files changed, 473 insertions(+), 2 deletions(-)
 create mode 100644 drivers/mfd/omap-usb-tll.c

diff --git a/arch/arm/plat-omap/include/plat/usb.h b/arch/arm/plat-omap/include/plat/usb.h
index dc864b5..eb1e47d 100644
--- a/arch/arm/plat-omap/include/plat/usb.h
+++ b/arch/arm/plat-omap/include/plat/usb.h
@@ -61,6 +61,10 @@ struct usbhs_omap_platform_data {
 	struct ehci_hcd_omap_platform_data	*ehci_data;
 	struct ohci_hcd_omap_platform_data	*ohci_data;
 };
+
+struct usbtll_omap_platform_data {
+	enum usbhs_omap_port_mode		port_mode[OMAP3_HS_USB_PORTS];
+};
 /*-------------------------------------------------------------------------*/
 
 #define OMAP1_OTG_BASE			0xfffb0400
@@ -105,6 +109,10 @@ extern int omap4430_phy_set_clk(struct device *dev, int on);
 extern int omap4430_phy_init(struct device *dev);
 extern int omap4430_phy_exit(struct device *dev);
 extern int omap4430_phy_suspend(struct device *dev, int suspend);
+
+extern int omap_tll_enable(void);
+extern int omap_tll_disable(void);
+
 #endif
 
 extern void am35x_musb_reset(void);
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index f147395..5f75ad4 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -772,7 +772,7 @@ config MFD_WL1273_CORE
 	  audio codec.
 
 config MFD_OMAP_USB_HOST
-	bool "Support OMAP USBHS core driver"
+	bool "Support OMAP USBHS core and TLL driver"
 	depends on USB_EHCI_HCD_OMAP || USB_OHCI_HCD_OMAP3
 	default y
 	help
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index b953bab..4b3a8e0 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -105,7 +105,7 @@ obj-$(CONFIG_MFD_TPS6586X)	+= tps6586x.o
 obj-$(CONFIG_MFD_VX855)		+= vx855.o
 obj-$(CONFIG_MFD_WL1273_CORE)	+= wl1273-core.o
 obj-$(CONFIG_MFD_CS5535)	+= cs5535-mfd.o
-obj-$(CONFIG_MFD_OMAP_USB_HOST)	+= omap-usb-host.o
+obj-$(CONFIG_MFD_OMAP_USB_HOST)	+= omap-usb-host.o omap-usb-tll.o
 obj-$(CONFIG_MFD_PM8921_CORE) 	+= pm8921-core.o
 obj-$(CONFIG_MFD_PM8XXX_IRQ) 	+= pm8xxx-irq.o
 obj-$(CONFIG_TPS65911_COMPARATOR)	+= tps65911-comparator.o
diff --git a/drivers/mfd/omap-usb-tll.c b/drivers/mfd/omap-usb-tll.c
new file mode 100644
index 0000000..3da468a
--- /dev/null
+++ b/drivers/mfd/omap-usb-tll.c
@@ -0,0 +1,463 @@
+/**
+ * omap-usb-tll.c - The USB TLL driver for OMAP EHCI & OHCI
+ *
+ * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com
+ * Author: Keshava Munegowda <keshava_mgowda@ti.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2  of
+ * the License as published by the Free Software Foundation.
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ */
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/slab.h>
+#include <linux/spinlock.h>
+#include <linux/platform_device.h>
+#include <linux/clk.h>
+#include <linux/io.h>
+#include <linux/err.h>
+#include <plat/usb.h>
+#include <linux/pm_runtime.h>
+
+#define USBTLL_DRIVER_NAME	"usbhs_tll"
+
+/* TLL Register Set */
+#define	OMAP_USBTLL_REVISION				(0x00)
+#define	OMAP_USBTLL_SYSCONFIG				(0x10)
+#define	OMAP_USBTLL_SYSCONFIG_CACTIVITY			(1 << 8)
+#define	OMAP_USBTLL_SYSCONFIG_SIDLEMODE			(1 << 3)
+#define	OMAP_USBTLL_SYSCONFIG_ENAWAKEUP			(1 << 2)
+#define	OMAP_USBTLL_SYSCONFIG_SOFTRESET			(1 << 1)
+#define	OMAP_USBTLL_SYSCONFIG_AUTOIDLE			(1 << 0)
+
+#define	OMAP_USBTLL_SYSSTATUS				(0x14)
+#define	OMAP_USBTLL_SYSSTATUS_RESETDONE			(1 << 0)
+
+#define	OMAP_USBTLL_IRQSTATUS				(0x18)
+#define	OMAP_USBTLL_IRQENABLE				(0x1C)
+
+#define	OMAP_TLL_SHARED_CONF				(0x30)
+#define	OMAP_TLL_SHARED_CONF_USB_90D_DDR_EN		(1 << 6)
+#define	OMAP_TLL_SHARED_CONF_USB_180D_SDR_EN		(1 << 5)
+#define	OMAP_TLL_SHARED_CONF_USB_DIVRATION		(1 << 2)
+#define	OMAP_TLL_SHARED_CONF_FCLK_REQ			(1 << 1)
+#define	OMAP_TLL_SHARED_CONF_FCLK_IS_ON			(1 << 0)
+
+#define	OMAP_TLL_CHANNEL_CONF(num)			(0x040 + 0x004 * num)
+#define OMAP_TLL_CHANNEL_CONF_FSLSMODE_SHIFT		24
+#define	OMAP_TLL_CHANNEL_CONF_ULPINOBITSTUFF		(1 << 11)
+#define	OMAP_TLL_CHANNEL_CONF_ULPI_ULPIAUTOIDLE		(1 << 10)
+#define	OMAP_TLL_CHANNEL_CONF_UTMIAUTOIDLE		(1 << 9)
+#define	OMAP_TLL_CHANNEL_CONF_ULPIDDRMODE		(1 << 8)
+#define OMAP_TLL_CHANNEL_CONF_CHANMODE_FSLS		(1 << 1)
+#define	OMAP_TLL_CHANNEL_CONF_CHANEN			(1 << 0)
+
+#define OMAP_TLL_FSLSMODE_6PIN_PHY_DAT_SE0		0x0
+#define OMAP_TLL_FSLSMODE_6PIN_PHY_DP_DM		0x1
+#define OMAP_TLL_FSLSMODE_3PIN_PHY			0x2
+#define OMAP_TLL_FSLSMODE_4PIN_PHY			0x3
+#define OMAP_TLL_FSLSMODE_6PIN_TLL_DAT_SE0		0x4
+#define OMAP_TLL_FSLSMODE_6PIN_TLL_DP_DM		0x5
+#define OMAP_TLL_FSLSMODE_3PIN_TLL			0x6
+#define OMAP_TLL_FSLSMODE_4PIN_TLL			0x7
+#define OMAP_TLL_FSLSMODE_2PIN_TLL_DAT_SE0		0xA
+#define OMAP_TLL_FSLSMODE_2PIN_DAT_DP_DM		0xB
+
+#define	OMAP_TLL_ULPI_FUNCTION_CTRL(num)		(0x804 + 0x100 * num)
+#define	OMAP_TLL_ULPI_INTERFACE_CTRL(num)		(0x807 + 0x100 * num)
+#define	OMAP_TLL_ULPI_OTG_CTRL(num)			(0x80A + 0x100 * num)
+#define	OMAP_TLL_ULPI_INT_EN_RISE(num)			(0x80D + 0x100 * num)
+#define	OMAP_TLL_ULPI_INT_EN_FALL(num)			(0x810 + 0x100 * num)
+#define	OMAP_TLL_ULPI_INT_STATUS(num)			(0x813 + 0x100 * num)
+#define	OMAP_TLL_ULPI_INT_LATCH(num)			(0x814 + 0x100 * num)
+#define	OMAP_TLL_ULPI_DEBUG(num)			(0x815 + 0x100 * num)
+#define	OMAP_TLL_ULPI_SCRATCH_REGISTER(num)		(0x816 + 0x100 * num)
+
+#define OMAP_REV2_TLL_CHANNEL_COUNT			2
+#define OMAP_TLL_CHANNEL_COUNT				3
+#define OMAP_TLL_CHANNEL_1_EN_MASK			(1 << 0)
+#define OMAP_TLL_CHANNEL_2_EN_MASK			(1 << 1)
+#define OMAP_TLL_CHANNEL_3_EN_MASK			(1 << 2)
+
+/* Values of USBTLL_REVISION - Note: these are not given in the TRM */
+#define OMAP_USBTLL_REV1		0x00000015	/* OMAP3 */
+#define OMAP_USBTLL_REV2		0x00000004	/* OMAP4 */
+
+#define is_ehci_tll_mode(x)	(x == OMAP_EHCI_PORT_MODE_TLL)
+
+struct usbtll_omap {
+	struct clk				*usbtll_p1_fck;
+	struct clk				*usbtll_p2_fck;
+	struct usbtll_omap_platform_data	platdata;
+	spinlock_t				lock;
+};
+
+/*-------------------------------------------------------------------------*/
+
+const char usbtll_driver_name[] = USBTLL_DRIVER_NAME;
+struct platform_device	*tll_pdev;
+
+/*-------------------------------------------------------------------------*/
+
+static inline void usbtll_write(void __iomem *base, u32 reg, u32 val)
+{
+	__raw_writel(val, base + reg);
+}
+
+static inline u32 usbtll_read(void __iomem *base, u32 reg)
+{
+	return __raw_readl(base + reg);
+}
+
+static inline void usbtll_writeb(void __iomem *base, u8 reg, u8 val)
+{
+	__raw_writeb(val, base + reg);
+}
+
+static inline u8 usbtll_readb(void __iomem *base, u8 reg)
+{
+	return __raw_readb(base + reg);
+}
+
+/*-------------------------------------------------------------------------*/
+
+static bool is_ohci_port(enum usbhs_omap_port_mode pmode)
+{
+	switch (pmode) {
+	case OMAP_OHCI_PORT_MODE_PHY_6PIN_DATSE0:
+	case OMAP_OHCI_PORT_MODE_PHY_6PIN_DPDM:
+	case OMAP_OHCI_PORT_MODE_PHY_3PIN_DATSE0:
+	case OMAP_OHCI_PORT_MODE_PHY_4PIN_DPDM:
+	case OMAP_OHCI_PORT_MODE_TLL_6PIN_DATSE0:
+	case OMAP_OHCI_PORT_MODE_TLL_6PIN_DPDM:
+	case OMAP_OHCI_PORT_MODE_TLL_3PIN_DATSE0:
+	case OMAP_OHCI_PORT_MODE_TLL_4PIN_DPDM:
+	case OMAP_OHCI_PORT_MODE_TLL_2PIN_DATSE0:
+	case OMAP_OHCI_PORT_MODE_TLL_2PIN_DPDM:
+		return true;
+
+	default:
+		return false;
+	}
+}
+
+/*
+ * convert the port-mode enum to a value we can use in the FSLSMODE
+ * field of USBTLL_CHANNEL_CONF
+ */
+static unsigned ohci_omap3_fslsmode(enum usbhs_omap_port_mode mode)
+{
+	switch (mode) {
+	case OMAP_USBHS_PORT_MODE_UNUSED:
+	case OMAP_OHCI_PORT_MODE_PHY_6PIN_DATSE0:
+		return OMAP_TLL_FSLSMODE_6PIN_PHY_DAT_SE0;
+
+	case OMAP_OHCI_PORT_MODE_PHY_6PIN_DPDM:
+		return OMAP_TLL_FSLSMODE_6PIN_PHY_DP_DM;
+
+	case OMAP_OHCI_PORT_MODE_PHY_3PIN_DATSE0:
+		return OMAP_TLL_FSLSMODE_3PIN_PHY;
+
+	case OMAP_OHCI_PORT_MODE_PHY_4PIN_DPDM:
+		return OMAP_TLL_FSLSMODE_4PIN_PHY;
+
+	case OMAP_OHCI_PORT_MODE_TLL_6PIN_DATSE0:
+		return OMAP_TLL_FSLSMODE_6PIN_TLL_DAT_SE0;
+
+	case OMAP_OHCI_PORT_MODE_TLL_6PIN_DPDM:
+		return OMAP_TLL_FSLSMODE_6PIN_TLL_DP_DM;
+
+	case OMAP_OHCI_PORT_MODE_TLL_3PIN_DATSE0:
+		return OMAP_TLL_FSLSMODE_3PIN_TLL;
+
+	case OMAP_OHCI_PORT_MODE_TLL_4PIN_DPDM:
+		return OMAP_TLL_FSLSMODE_4PIN_TLL;
+
+	case OMAP_OHCI_PORT_MODE_TLL_2PIN_DATSE0:
+		return OMAP_TLL_FSLSMODE_2PIN_TLL_DAT_SE0;
+
+	case OMAP_OHCI_PORT_MODE_TLL_2PIN_DPDM:
+		return OMAP_TLL_FSLSMODE_2PIN_DAT_DP_DM;
+	default:
+		pr_warning("Invalid port mode, using default\n");
+		return OMAP_TLL_FSLSMODE_6PIN_PHY_DAT_SE0;
+	}
+}
+
+/**
+ * usbtll_omap_probe - initialize TI-based HCDs
+ *
+ * Allocates basic resources for this USB host controller.
+ */
+static int __devinit usbtll_omap_probe(struct platform_device *pdev)
+{
+	struct device				*dev =  &pdev->dev;
+	struct usbtll_omap_platform_data	*pdata = dev->platform_data;
+	void __iomem				*base;
+	struct resource				*res;
+	struct usbtll_omap			*tll;
+	unsigned				reg;
+	unsigned long				flags;
+	int					ret = 0;
+	int					i, ver, count;
+
+	dev_dbg(dev, "starting TI HSUSB TLL Controller\n");
+
+	tll = kzalloc(sizeof(struct usbtll_omap), GFP_KERNEL);
+	if (!tll) {
+		dev_err(dev, "Memory allocation failed\n");
+		ret = -ENOMEM;
+		goto end;
+	}
+
+	spin_lock_init(&tll->lock);
+
+	for (i = 0; i < OMAP3_HS_USB_PORTS; i++)
+		tll->platdata.port_mode[i] = pdata->port_mode[i];
+
+	tll->usbtll_p1_fck = clk_get(dev, "usb_tll_hs_usb_ch0_clk");
+	if (IS_ERR(tll->usbtll_p1_fck)) {
+		ret = PTR_ERR(tll->usbtll_p1_fck);
+		dev_err(dev, "usbtll_p1_fck failed error:%d\n", ret);
+		goto err_tll;
+	}
+
+	tll->usbtll_p2_fck = clk_get(dev, "usb_tll_hs_usb_ch1_clk");
+	if (IS_ERR(tll->usbtll_p2_fck)) {
+		ret = PTR_ERR(tll->usbtll_p2_fck);
+		dev_err(dev, "usbtll_p2_fck failed error:%d\n", ret);
+		goto err_usbtll_p1_fck;
+	}
+
+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+	if (!res) {
+		dev_err(dev, "usb tll get resource failed\n");
+		ret = -ENODEV;
+		goto err_usbtll_p2_fck;
+	}
+
+	base = ioremap(res->start, resource_size(res));
+	if (!base) {
+		dev_err(dev, "TLL ioremap failed\n");
+		ret = -ENOMEM;
+		goto err_usbtll_p2_fck;
+	}
+
+	platform_set_drvdata(pdev, tll);
+	pm_runtime_enable(dev);
+	pm_runtime_get_sync(dev);
+
+	spin_lock_irqsave(&tll->lock, flags);
+
+	ver =  usbtll_read(base, OMAP_USBTLL_REVISION);
+	if (ver == OMAP_USBTLL_REV1)
+		count = OMAP_TLL_CHANNEL_COUNT;
+	else if (ver == OMAP_USBTLL_REV2)
+		count = OMAP_REV2_TLL_CHANNEL_COUNT;
+	else {
+		dev_err(dev, "TLL version failed\n");
+		ret = -ENODEV;
+		goto err_ioremap;
+	}
+
+	if (is_ehci_tll_mode(pdata->port_mode[0]) ||
+		is_ehci_tll_mode(pdata->port_mode[1]) ||
+		is_ehci_tll_mode(pdata->port_mode[2]) ||
+		(is_ohci_port(pdata->port_mode[0])) ||
+		(is_ohci_port(pdata->port_mode[1])) ||
+		(is_ohci_port(pdata->port_mode[2]))) {
+
+		/* Program Common TLL register */
+		reg = usbtll_read(base, OMAP_TLL_SHARED_CONF);
+		reg |= (OMAP_TLL_SHARED_CONF_FCLK_IS_ON
+			| OMAP_TLL_SHARED_CONF_USB_DIVRATION);
+		reg &= ~OMAP_TLL_SHARED_CONF_USB_90D_DDR_EN;
+		reg &= ~OMAP_TLL_SHARED_CONF_USB_180D_SDR_EN;
+
+		usbtll_write(base, OMAP_TLL_SHARED_CONF, reg);
+
+		/* Enable channels now */
+		for (i = 0; i < count; i++) {
+			reg = usbtll_read(base,	OMAP_TLL_CHANNEL_CONF(i));
+
+			if (is_ohci_port(pdata->port_mode[i])) {
+				reg |= ohci_omap3_fslsmode(pdata->port_mode[i])
+				<< OMAP_TLL_CHANNEL_CONF_FSLSMODE_SHIFT;
+				reg |= OMAP_TLL_CHANNEL_CONF_CHANMODE_FSLS;
+			} else
+			if (pdata->port_mode[i] == OMAP_EHCI_PORT_MODE_TLL) {
+
+				/*
+				 * Disable AutoIdle, BitStuffing
+				 * and use SDR Mode
+				 */
+				reg &= ~(OMAP_TLL_CHANNEL_CONF_UTMIAUTOIDLE
+					| OMAP_TLL_CHANNEL_CONF_ULPINOBITSTUFF
+					| OMAP_TLL_CHANNEL_CONF_ULPIDDRMODE);
+			} else
+				continue;
+
+			reg |= OMAP_TLL_CHANNEL_CONF_CHANEN;
+			usbtll_write(base, OMAP_TLL_CHANNEL_CONF(i), reg);
+
+			usbtll_writeb(base,
+				OMAP_TLL_ULPI_SCRATCH_REGISTER(i), 0xbe);
+		}
+	}
+
+err_ioremap:
+	spin_unlock_irqrestore(&tll->lock, flags);
+	iounmap(base);
+	pm_runtime_put_sync(dev);
+	tll_pdev = pdev;
+	if (!ret)
+		goto end;
+	pm_runtime_disable(dev);
+
+err_usbtll_p2_fck:
+	clk_put(tll->usbtll_p2_fck);
+
+err_usbtll_p1_fck:
+	clk_put(tll->usbtll_p1_fck);
+
+err_tll:
+	kfree(tll);
+
+end:
+	return ret;
+}
+
+/**
+ * usbtll_omap_remove - shutdown processing for UHH & TLL HCDs
+ * @pdev: USB Host Controller being removed
+ *
+ * Reverses the effect of usbtll_omap_probe().
+ */
+static int __devexit usbtll_omap_remove(struct platform_device *pdev)
+{
+	struct usbtll_omap *tll = platform_get_drvdata(pdev);
+
+	clk_put(tll->usbtll_p2_fck);
+	clk_put(tll->usbtll_p1_fck);
+	pm_runtime_disable(&pdev->dev);
+	kfree(tll);
+	return 0;
+}
+
+static int usbtll_runtime_resume(struct device *dev)
+{
+	struct usbtll_omap			*tll = dev_get_drvdata(dev);
+	struct usbtll_omap_platform_data	*pdata = &tll->platdata;
+	unsigned long				flags;
+
+	dev_dbg(dev, "usbtll_runtime_resume\n");
+
+	if (!pdata) {
+		dev_dbg(dev, "missing platform_data\n");
+		return  -ENODEV;
+	}
+
+	spin_lock_irqsave(&tll->lock, flags);
+
+	if (is_ehci_tll_mode(pdata->port_mode[0]))
+		clk_enable(tll->usbtll_p1_fck);
+
+	if (is_ehci_tll_mode(pdata->port_mode[1]))
+		clk_enable(tll->usbtll_p2_fck);
+
+	spin_unlock_irqrestore(&tll->lock, flags);
+
+	return 0;
+}
+
+static int usbtll_runtime_suspend(struct device *dev)
+{
+	struct usbtll_omap			*tll = dev_get_drvdata(dev);
+	struct usbtll_omap_platform_data	*pdata = &tll->platdata;
+	unsigned long				flags;
+
+	dev_dbg(dev, "usbtll_runtime_suspend\n");
+
+	if (!pdata) {
+		dev_dbg(dev, "missing platform_data\n");
+		return  -ENODEV;
+	}
+
+	spin_lock_irqsave(&tll->lock, flags);
+
+	if (is_ehci_tll_mode(pdata->port_mode[0]))
+		clk_disable(tll->usbtll_p1_fck);
+
+	if (is_ehci_tll_mode(pdata->port_mode[1]))
+		clk_disable(tll->usbtll_p2_fck);
+
+	spin_unlock_irqrestore(&tll->lock, flags);
+
+	return 0;
+}
+
+static const struct dev_pm_ops usbtllomap_dev_pm_ops = {
+	.runtime_suspend	= usbtll_runtime_suspend,
+	.runtime_resume		= usbtll_runtime_resume,
+};
+
+static struct platform_driver usbtll_omap_driver = {
+	.driver = {
+		.name		= (char *)usbtll_driver_name,
+		.owner		= THIS_MODULE,
+		.pm		= &usbtllomap_dev_pm_ops,
+	},
+	.remove		= __exit_p(usbtll_omap_remove),
+};
+
+int omap_tll_enable(void)
+{
+	if (!tll_pdev) {
+		dev_dbg(&tll_pdev->dev, "missing platform_data\n");
+		return  -ENODEV;
+	}
+	return pm_runtime_get_sync(&tll_pdev->dev);
+}
+EXPORT_SYMBOL_GPL(omap_tll_enable);
+
+int omap_tll_disable(void)
+{
+	if (!tll_pdev) {
+		dev_dbg(&tll_pdev->dev, "missing platform_data\n");
+		return  -ENODEV;
+	}
+	return pm_runtime_put_sync(&tll_pdev->dev);
+}
+EXPORT_SYMBOL_GPL(omap_tll_disable);
+
+MODULE_AUTHOR("Keshava Munegowda <keshava_mgowda@ti.com>");
+MODULE_ALIAS("platform:" USBHS_DRIVER_NAME);
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("usb tll driver for TI OMAP EHCI and OHCI controllers");
+
+static int __init omap_usbtll_drvinit(void)
+{
+	return platform_driver_probe(&usbtll_omap_driver, usbtll_omap_probe);
+}
+
+/*
+ * init before usbhs core driver;
+ * The usbtll driver should be initialized before
+ * the usbhs core driver probe function is called.
+ */
+fs_initcall(omap_usbtll_drvinit);
+
+static void __exit omap_usbtll_drvexit(void)
+{
+	platform_driver_unregister(&usbtll_omap_driver);
+}
+module_exit(omap_usbtll_drvexit);
-- 
1.6.0.4

[PATCH 2/5 RESEND] ARM: OMAP: USB: Build the USB HOST TLL omap device

[Keshava Munegowda]

From: Keshava Munegowda <Keshava_mgowda@ti.com>

The hwmod of the usb tll is retrieved and omap device build is
performed to created the platform device for the usb tll component.

Signed-off-by: Keshava Munegowda <keshava_mgowda@ti.com>
Reviewed-by: Partha Basak <parthab@india.ti.com>
---
 arch/arm/mach-omap2/usb-host.c |   28 ++++++++++++++++++++--------
 1 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/arch/arm/mach-omap2/usb-host.c b/arch/arm/mach-omap2/usb-host.c
index f51348d..dc6769a 100644
--- a/arch/arm/mach-omap2/usb-host.c
+++ b/arch/arm/mach-omap2/usb-host.c
@@ -35,10 +35,12 @@
 #ifdef CONFIG_MFD_OMAP_USB_HOST
 
 #define OMAP_USBHS_DEVICE	"usbhs_omap"
+#define OMAP_USBTLL_DEVICE	"usbhs_tll"
 #define	USBHS_UHH_HWMODNAME	"usb_host_hs"
 #define USBHS_TLL_HWMODNAME	"usb_tll_hs"
 
 static struct usbhs_omap_platform_data		usbhs_data;
+static struct usbtll_omap_platform_data		usbtll_data;
 static struct ehci_hcd_omap_platform_data	ehci_data;
 static struct ohci_hcd_omap_platform_data	ohci_data;
 
@@ -485,7 +487,7 @@ static void setup_4430ohci_io_mux(const enum usbhs_omap_port_mode *port_mode)
 
 void __init usbhs_init(const struct usbhs_omap_board_data *pdata)
 {
-	struct omap_hwmod	*oh[2];
+	struct omap_hwmod	*uhh_hwm, *tll_hwm;
 	struct platform_device	*pdev;
 	int			bus_id = -1;
 	int			i;
@@ -510,25 +512,35 @@ void __init usbhs_init(const struct usbhs_omap_board_data *pdata)
 		setup_4430ohci_io_mux(pdata->port_mode);
 	}
 
-	oh[0] = omap_hwmod_lookup(USBHS_UHH_HWMODNAME);
-	if (!oh[0]) {
+	uhh_hwm = omap_hwmod_lookup(USBHS_UHH_HWMODNAME);
+	if (!uhh_hwm) {
 		pr_err("Could not look up %s\n", USBHS_UHH_HWMODNAME);
 		return;
 	}
 
-	oh[1] = omap_hwmod_lookup(USBHS_TLL_HWMODNAME);
-	if (!oh[1]) {
+	tll_hwm = omap_hwmod_lookup(USBHS_TLL_HWMODNAME);
+	if (!tll_hwm) {
 		pr_err("Could not look up %s\n", USBHS_TLL_HWMODNAME);
 		return;
 	}
 
-	pdev = omap_device_build_ss(OMAP_USBHS_DEVICE, bus_id, oh, 2,
+	pdev = omap_device_build(OMAP_USBTLL_DEVICE, bus_id, tll_hwm,
+				(void *)&usbtll_data, sizeof(usbtll_data),
+				omap_uhhtll_latency,
+				ARRAY_SIZE(omap_uhhtll_latency), false);
+	if (IS_ERR(pdev)) {
+		pr_err("Could not build hwmod device %s\n",
+			USBHS_TLL_HWMODNAME);
+		return;
+	}
+
+	pdev = omap_device_build(OMAP_USBHS_DEVICE, bus_id, uhh_hwm,
 				(void *)&usbhs_data, sizeof(usbhs_data),
 				omap_uhhtll_latency,
 				ARRAY_SIZE(omap_uhhtll_latency), false);
 	if (IS_ERR(pdev)) {
-		pr_err("Could not build hwmod devices %s,%s\n",
-			USBHS_UHH_HWMODNAME, USBHS_TLL_HWMODNAME);
+		pr_err("Could not build hwmod devices %s\n",
+			USBHS_UHH_HWMODNAME);
 		return;
 	}
 }
-- 
1.6.0.4

[PATCH 3/5 RESEND] ARM: OMAP: USB: Remove TLL specific code

[Keshava Munegowda]

From: Keshava Munegowda <Keshava_mgowda-l0cyMroinI0@public.gmane.org>

The TLL specific code such as channels clocks enable/disable,
initialization functions are removed from the USBHS core
driver.

Signed-off-by: Keshava Munegowda <keshava_mgowda-l0cyMroinI0@public.gmane.org>
Reviewed-by: Partha Basak <parthab-PpE0FKYn9XJWk0Htik3J/w@public.gmane.org>
---
 drivers/mfd/omap-usb-host.c |  225 ++-----------------------------------------
 1 files changed, 8 insertions(+), 217 deletions(-)

diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
index 9927129..4de87c6 100644
--- a/drivers/mfd/omap-usb-host.c
+++ b/drivers/mfd/omap-usb-host.c
@@ -34,63 +34,6 @@
 
 /* OMAP USBHOST Register addresses  */
 
-/* TLL Register Set */
-#define	OMAP_USBTLL_REVISION				(0x00)
-#define	OMAP_USBTLL_SYSCONFIG				(0x10)
-#define	OMAP_USBTLL_SYSCONFIG_CACTIVITY			(1 << 8)
-#define	OMAP_USBTLL_SYSCONFIG_SIDLEMODE			(1 << 3)
-#define	OMAP_USBTLL_SYSCONFIG_ENAWAKEUP			(1 << 2)
-#define	OMAP_USBTLL_SYSCONFIG_SOFTRESET			(1 << 1)
-#define	OMAP_USBTLL_SYSCONFIG_AUTOIDLE			(1 << 0)
-
-#define	OMAP_USBTLL_SYSSTATUS				(0x14)
-#define	OMAP_USBTLL_SYSSTATUS_RESETDONE			(1 << 0)
-
-#define	OMAP_USBTLL_IRQSTATUS				(0x18)
-#define	OMAP_USBTLL_IRQENABLE				(0x1C)
-
-#define	OMAP_TLL_SHARED_CONF				(0x30)
-#define	OMAP_TLL_SHARED_CONF_USB_90D_DDR_EN		(1 << 6)
-#define	OMAP_TLL_SHARED_CONF_USB_180D_SDR_EN		(1 << 5)
-#define	OMAP_TLL_SHARED_CONF_USB_DIVRATION		(1 << 2)
-#define	OMAP_TLL_SHARED_CONF_FCLK_REQ			(1 << 1)
-#define	OMAP_TLL_SHARED_CONF_FCLK_IS_ON			(1 << 0)
-
-#define	OMAP_TLL_CHANNEL_CONF(num)			(0x040 + 0x004 * num)
-#define OMAP_TLL_CHANNEL_CONF_FSLSMODE_SHIFT		24
-#define	OMAP_TLL_CHANNEL_CONF_ULPINOBITSTUFF		(1 << 11)
-#define	OMAP_TLL_CHANNEL_CONF_ULPI_ULPIAUTOIDLE		(1 << 10)
-#define	OMAP_TLL_CHANNEL_CONF_UTMIAUTOIDLE		(1 << 9)
-#define	OMAP_TLL_CHANNEL_CONF_ULPIDDRMODE		(1 << 8)
-#define OMAP_TLL_CHANNEL_CONF_CHANMODE_FSLS		(1 << 1)
-#define	OMAP_TLL_CHANNEL_CONF_CHANEN			(1 << 0)
-
-#define OMAP_TLL_FSLSMODE_6PIN_PHY_DAT_SE0		0x0
-#define OMAP_TLL_FSLSMODE_6PIN_PHY_DP_DM		0x1
-#define OMAP_TLL_FSLSMODE_3PIN_PHY			0x2
-#define OMAP_TLL_FSLSMODE_4PIN_PHY			0x3
-#define OMAP_TLL_FSLSMODE_6PIN_TLL_DAT_SE0		0x4
-#define OMAP_TLL_FSLSMODE_6PIN_TLL_DP_DM		0x5
-#define OMAP_TLL_FSLSMODE_3PIN_TLL			0x6
-#define OMAP_TLL_FSLSMODE_4PIN_TLL			0x7
-#define OMAP_TLL_FSLSMODE_2PIN_TLL_DAT_SE0		0xA
-#define OMAP_TLL_FSLSMODE_2PIN_DAT_DP_DM		0xB
-
-#define	OMAP_TLL_ULPI_FUNCTION_CTRL(num)		(0x804 + 0x100 * num)
-#define	OMAP_TLL_ULPI_INTERFACE_CTRL(num)		(0x807 + 0x100 * num)
-#define	OMAP_TLL_ULPI_OTG_CTRL(num)			(0x80A + 0x100 * num)
-#define	OMAP_TLL_ULPI_INT_EN_RISE(num)			(0x80D + 0x100 * num)
-#define	OMAP_TLL_ULPI_INT_EN_FALL(num)			(0x810 + 0x100 * num)
-#define	OMAP_TLL_ULPI_INT_STATUS(num)			(0x813 + 0x100 * num)
-#define	OMAP_TLL_ULPI_INT_LATCH(num)			(0x814 + 0x100 * num)
-#define	OMAP_TLL_ULPI_DEBUG(num)			(0x815 + 0x100 * num)
-#define	OMAP_TLL_ULPI_SCRATCH_REGISTER(num)		(0x816 + 0x100 * num)
-
-#define OMAP_TLL_CHANNEL_COUNT				3
-#define OMAP_TLL_CHANNEL_1_EN_MASK			(1 << 0)
-#define OMAP_TLL_CHANNEL_2_EN_MASK			(1 << 1)
-#define OMAP_TLL_CHANNEL_3_EN_MASK			(1 << 2)
-
 /* UHH Register Set */
 #define	OMAP_UHH_REVISION				(0x00)
 #define	OMAP_UHH_SYSCONFIG				(0x10)
@@ -130,8 +73,6 @@
 #define OMAP4_P2_MODE_TLL				(1 << 18)
 #define OMAP4_P2_MODE_HSIC				(3 << 18)
 
-#define OMAP_REV2_TLL_CHANNEL_COUNT			2
-
 #define	OMAP_UHH_DEBUG_CSR				(0x44)
 
 /* Values of UHH_REVISION - Note: these are not given in the TRM */
@@ -151,15 +92,12 @@ struct usbhs_hcd_omap {
 	struct clk			*xclk60mhsp2_ck;
 	struct clk			*utmi_p1_fck;
 	struct clk			*usbhost_p1_fck;
-	struct clk			*usbtll_p1_fck;
 	struct clk			*utmi_p2_fck;
 	struct clk			*usbhost_p2_fck;
-	struct clk			*usbtll_p2_fck;
 	struct clk			*init_60m_fclk;
 	struct clk			*ehci_logic_fck;
 
 	void __iomem			*uhh_base;
-	void __iomem			*tll_base;
 
 	struct usbhs_omap_platform_data	platdata;
 
@@ -334,93 +272,6 @@ static bool is_ohci_port(enum usbhs_omap_port_mode pmode)
 	}
 }
 
-/*
- * convert the port-mode enum to a value we can use in the FSLSMODE
- * field of USBTLL_CHANNEL_CONF
- */
-static unsigned ohci_omap3_fslsmode(enum usbhs_omap_port_mode mode)
-{
-	switch (mode) {
-	case OMAP_USBHS_PORT_MODE_UNUSED:
-	case OMAP_OHCI_PORT_MODE_PHY_6PIN_DATSE0:
-		return OMAP_TLL_FSLSMODE_6PIN_PHY_DAT_SE0;
-
-	case OMAP_OHCI_PORT_MODE_PHY_6PIN_DPDM:
-		return OMAP_TLL_FSLSMODE_6PIN_PHY_DP_DM;
-
-	case OMAP_OHCI_PORT_MODE_PHY_3PIN_DATSE0:
-		return OMAP_TLL_FSLSMODE_3PIN_PHY;
-
-	case OMAP_OHCI_PORT_MODE_PHY_4PIN_DPDM:
-		return OMAP_TLL_FSLSMODE_4PIN_PHY;
-
-	case OMAP_OHCI_PORT_MODE_TLL_6PIN_DATSE0:
-		return OMAP_TLL_FSLSMODE_6PIN_TLL_DAT_SE0;
-
-	case OMAP_OHCI_PORT_MODE_TLL_6PIN_DPDM:
-		return OMAP_TLL_FSLSMODE_6PIN_TLL_DP_DM;
-
-	case OMAP_OHCI_PORT_MODE_TLL_3PIN_DATSE0:
-		return OMAP_TLL_FSLSMODE_3PIN_TLL;
-
-	case OMAP_OHCI_PORT_MODE_TLL_4PIN_DPDM:
-		return OMAP_TLL_FSLSMODE_4PIN_TLL;
-
-	case OMAP_OHCI_PORT_MODE_TLL_2PIN_DATSE0:
-		return OMAP_TLL_FSLSMODE_2PIN_TLL_DAT_SE0;
-
-	case OMAP_OHCI_PORT_MODE_TLL_2PIN_DPDM:
-		return OMAP_TLL_FSLSMODE_2PIN_DAT_DP_DM;
-	default:
-		pr_warning("Invalid port mode, using default\n");
-		return OMAP_TLL_FSLSMODE_6PIN_PHY_DAT_SE0;
-	}
-}
-
-static void usbhs_omap_tll_init(struct device *dev, u8 tll_channel_count)
-{
-	struct usbhs_hcd_omap		*omap = dev_get_drvdata(dev);
-	struct usbhs_omap_platform_data	*pdata = dev->platform_data;
-	unsigned			reg;
-	int				i;
-
-	/* Program Common TLL register */
-	reg = usbhs_read(omap->tll_base, OMAP_TLL_SHARED_CONF);
-	reg |= (OMAP_TLL_SHARED_CONF_FCLK_IS_ON
-		| OMAP_TLL_SHARED_CONF_USB_DIVRATION);
-	reg &= ~OMAP_TLL_SHARED_CONF_USB_90D_DDR_EN;
-	reg &= ~OMAP_TLL_SHARED_CONF_USB_180D_SDR_EN;
-
-	usbhs_write(omap->tll_base, OMAP_TLL_SHARED_CONF, reg);
-
-	/* Enable channels now */
-	for (i = 0; i < tll_channel_count; i++) {
-		reg = usbhs_read(omap->tll_base,
-				OMAP_TLL_CHANNEL_CONF(i));
-
-		if (is_ohci_port(pdata->port_mode[i])) {
-			reg |= ohci_omap3_fslsmode(pdata->port_mode[i])
-				<< OMAP_TLL_CHANNEL_CONF_FSLSMODE_SHIFT;
-			reg |= OMAP_TLL_CHANNEL_CONF_CHANMODE_FSLS;
-		} else if (pdata->port_mode[i] == OMAP_EHCI_PORT_MODE_TLL) {
-
-			/* Disable AutoIdle, BitStuffing and use SDR Mode */
-			reg &= ~(OMAP_TLL_CHANNEL_CONF_UTMIAUTOIDLE
-				| OMAP_TLL_CHANNEL_CONF_ULPINOBITSTUFF
-				| OMAP_TLL_CHANNEL_CONF_ULPIDDRMODE);
-
-		} else
-			continue;
-
-		reg |= OMAP_TLL_CHANNEL_CONF_CHANEN;
-		usbhs_write(omap->tll_base,
-				OMAP_TLL_CHANNEL_CONF(i), reg);
-
-		usbhs_writeb(omap->tll_base,
-				OMAP_TLL_ULPI_SCRATCH_REGISTER(i), 0xbe);
-	}
-}
-
 static int usbhs_runtime_resume(struct device *dev)
 {
 	struct usbhs_hcd_omap		*omap = dev_get_drvdata(dev);
@@ -439,14 +290,11 @@ static int usbhs_runtime_resume(struct device *dev)
 	if (omap->ehci_logic_fck && !IS_ERR(omap->ehci_logic_fck))
 		clk_enable(omap->ehci_logic_fck);
 
-	if (is_ehci_tll_mode(pdata->port_mode[0])) {
+	if (is_ehci_tll_mode(pdata->port_mode[0]))
 		clk_enable(omap->usbhost_p1_fck);
-		clk_enable(omap->usbtll_p1_fck);
-	}
-	if (is_ehci_tll_mode(pdata->port_mode[1])) {
+	if (is_ehci_tll_mode(pdata->port_mode[1]))
 		clk_enable(omap->usbhost_p2_fck);
-		clk_enable(omap->usbtll_p2_fck);
-	}
+
 	clk_enable(omap->utmi_p1_fck);
 	clk_enable(omap->utmi_p2_fck);
 
@@ -470,14 +318,11 @@ static int usbhs_runtime_suspend(struct device *dev)
 
 	spin_lock_irqsave(&omap->lock, flags);
 
-	if (is_ehci_tll_mode(pdata->port_mode[0])) {
+	if (is_ehci_tll_mode(pdata->port_mode[0]))
 		clk_disable(omap->usbhost_p1_fck);
-		clk_disable(omap->usbtll_p1_fck);
-	}
-	if (is_ehci_tll_mode(pdata->port_mode[1])) {
+	if (is_ehci_tll_mode(pdata->port_mode[1]))
 		clk_disable(omap->usbhost_p2_fck);
-		clk_disable(omap->usbtll_p2_fck);
-	}
+
 	clk_disable(omap->utmi_p2_fck);
 	clk_disable(omap->utmi_p1_fck);
 
@@ -565,20 +410,6 @@ static void omap_usbhs_init(struct device *dev)
 	usbhs_write(omap->uhh_base, OMAP_UHH_HOSTCONFIG, reg);
 	dev_dbg(dev, "UHH setup done, uhh_hostconfig=%x\n", reg);
 
-	if (is_ehci_tll_mode(pdata->port_mode[0]) ||
-		is_ehci_tll_mode(pdata->port_mode[1]) ||
-		is_ehci_tll_mode(pdata->port_mode[2]) ||
-		(is_ohci_port(pdata->port_mode[0])) ||
-		(is_ohci_port(pdata->port_mode[1])) ||
-		(is_ohci_port(pdata->port_mode[2]))) {
-
-		/* Enable UTMI mode for required TLL channels */
-		if (is_omap_usbhs_rev2(omap))
-			usbhs_omap_tll_init(dev, OMAP_REV2_TLL_CHANNEL_COUNT);
-		else
-			usbhs_omap_tll_init(dev, OMAP_TLL_CHANNEL_COUNT);
-	}
-
 	spin_unlock_irqrestore(&omap->lock, flags);
 	pm_runtime_put_sync(dev);
 }
@@ -669,32 +500,18 @@ static int __devinit usbhs_omap_probe(struct platform_device *pdev)
 		goto err_xclk60mhsp2_ck;
 	}
 
-	omap->usbtll_p1_fck = clk_get(dev, "usb_tll_hs_usb_ch0_clk");
-	if (IS_ERR(omap->usbtll_p1_fck)) {
-		ret = PTR_ERR(omap->usbtll_p1_fck);
-		dev_err(dev, "usbtll_p1_fck failed error:%d\n", ret);
-		goto err_usbhost_p1_fck;
-	}
-
 	omap->usbhost_p2_fck = clk_get(dev, "usb_host_hs_utmi_p2_clk");
 	if (IS_ERR(omap->usbhost_p2_fck)) {
 		ret = PTR_ERR(omap->usbhost_p2_fck);
 		dev_err(dev, "usbhost_p2_fck failed error:%d\n", ret);
-		goto err_usbtll_p1_fck;
-	}
-
-	omap->usbtll_p2_fck = clk_get(dev, "usb_tll_hs_usb_ch1_clk");
-	if (IS_ERR(omap->usbtll_p2_fck)) {
-		ret = PTR_ERR(omap->usbtll_p2_fck);
-		dev_err(dev, "usbtll_p2_fck failed error:%d\n", ret);
-		goto err_usbhost_p2_fck;
+		goto err_usbhost_p1_fck;
 	}
 
 	omap->init_60m_fclk = clk_get(dev, "init_60m_fclk");
 	if (IS_ERR(omap->init_60m_fclk)) {
 		ret = PTR_ERR(omap->init_60m_fclk);
 		dev_err(dev, "init_60m_fclk failed error:%d\n", ret);
-		goto err_usbtll_p2_fck;
+		goto err_usbhost_p2_fck;
 	}
 
 	if (is_ehci_phy_mode(pdata->port_mode[0])) {
@@ -740,20 +557,6 @@ static int __devinit usbhs_omap_probe(struct platform_device *pdev)
 		goto err_init_60m_fclk;
 	}
 
-	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "tll");
-	if (!res) {
-		dev_err(dev, "UHH EHCI get resource failed\n");
-		ret = -ENODEV;
-		goto err_tll;
-	}
-
-	omap->tll_base = ioremap(res->start, resource_size(res));
-	if (!omap->tll_base) {
-		dev_err(dev, "TLL ioremap failed\n");
-		ret = -ENOMEM;
-		goto err_tll;
-	}
-
 	platform_set_drvdata(pdev, omap);
 
 	ret = omap_usbhs_alloc_children(pdev);
@@ -767,23 +570,14 @@ static int __devinit usbhs_omap_probe(struct platform_device *pdev)
 	goto end_probe;
 
 err_alloc:
-	iounmap(omap->tll_base);
-
-err_tll:
 	iounmap(omap->uhh_base);
 
 err_init_60m_fclk:
 	clk_put(omap->init_60m_fclk);
 
-err_usbtll_p2_fck:
-	clk_put(omap->usbtll_p2_fck);
-
 err_usbhost_p2_fck:
 	clk_put(omap->usbhost_p2_fck);
 
-err_usbtll_p1_fck:
-	clk_put(omap->usbtll_p1_fck);

[PATCH 4/5 RESEND] ARM: OMAP: USB: Invoke the TLL driver from USB HS core driver

[Keshava Munegowda]

From: Keshava Munegowda <Keshava_mgowda-l0cyMroinI0@public.gmane.org>

The usbhs driver invokes the enable/disable APIs of the
usb tll driver in the runtime resume/suspend callbacks
of the runtime get sync and put sync of the usbhs driver.

Signed-off-by: Keshava Munegowda <keshava_mgowda-l0cyMroinI0@public.gmane.org>
Reviewed-by: Partha Basak <parthab-PpE0FKYn9XJWk0Htik3J/w@public.gmane.org>
---
 arch/arm/plat-omap/include/plat/usb.h |    1 +
 drivers/mfd/omap-usb-host.c           |    7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/arch/arm/plat-omap/include/plat/usb.h b/arch/arm/plat-omap/include/plat/usb.h
index eb1e47d..3b8f139 100644
--- a/arch/arm/plat-omap/include/plat/usb.h
+++ b/arch/arm/plat-omap/include/plat/usb.h
@@ -3,6 +3,7 @@
 #ifndef	__ASM_ARCH_OMAP_USB_H
 #define	__ASM_ARCH_OMAP_USB_H
 
+#include <linux/platform_device.h>
 #include <linux/usb/musb.h>
 #include <plat/board.h>
 
diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
index 4de87c6..9d84339 100644
--- a/drivers/mfd/omap-usb-host.c
+++ b/drivers/mfd/omap-usb-host.c
@@ -21,7 +21,6 @@
 #include <linux/types.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
-#include <linux/platform_device.h>
 #include <linux/clk.h>
 #include <linux/dma-mapping.h>
 #include <linux/spinlock.h>
@@ -285,6 +284,7 @@ static int usbhs_runtime_resume(struct device *dev)
 		return  -ENODEV;
 	}
 
+	omap_tll_enable();
 	spin_lock_irqsave(&omap->lock, flags);
 
 	if (omap->ehci_logic_fck && !IS_ERR(omap->ehci_logic_fck))
@@ -330,6 +330,7 @@ static int usbhs_runtime_suspend(struct device *dev)
 		clk_disable(omap->ehci_logic_fck);
 
 	spin_unlock_irqrestore(&omap->lock, flags);
+	omap_tll_disable();
 
 	return 0;
 }
@@ -655,8 +656,10 @@ static int __init omap_usbhs_drvinit(void)
  * init before ehci and ohci drivers;
  * The usbhs core driver should be initialized much before
  * the omap ehci and ohci probe functions are called.
+ * this usbhs core driver should be initialized after
+ * usb tll driver.
  */
-fs_initcall(omap_usbhs_drvinit);
+fs_initcall_sync(omap_usbhs_drvinit);
 
 static void __exit omap_usbhs_drvexit(void)
 {
-- 
1.6.0.4

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

[PATCH 5/5 RESEND] ARM: OMAP: change the USB TLL clocks device name

[Keshava Munegowda]

From: Keshava Munegowda <Keshava_mgowda-l0cyMroinI0@public.gmane.org>

The platform device name for the functional, interface and
channel clocks of the TLL module is changed from usbhs device
to usb tll platform device name.

Signed-off-by: Keshava Munegowda <keshava_mgowda-l0cyMroinI0@public.gmane.org>
Reviewed-by: Partha Basak <parthab-PpE0FKYn9XJWk0Htik3J/w@public.gmane.org>
---
 arch/arm/mach-omap2/clock3xxx_data.c |    8 ++++----
 arch/arm/mach-omap2/clock44xx_data.c |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c
index d75e5f6..9fd2242 100644
--- a/arch/arm/mach-omap2/clock3xxx_data.c
+++ b/arch/arm/mach-omap2/clock3xxx_data.c
@@ -3297,7 +3297,7 @@ static struct omap_clk omap3xxx_clks[] = {
 	CLK(NULL,	"cpefuse_fck",	&cpefuse_fck,	CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
 	CLK(NULL,	"ts_fck",	&ts_fck,	CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
 	CLK(NULL,	"usbtll_fck",	&usbtll_fck,	CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
-	CLK("usbhs_omap",	"usbtll_fck",	&usbtll_fck,	CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
+	CLK("usbhs_tll",	"usbtll_fck",	&usbtll_fck,	CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
 	CLK("omap-mcbsp.1",	"prcm_fck",	&core_96m_fck,	CK_3XXX),
 	CLK("omap-mcbsp.5",	"prcm_fck",	&core_96m_fck,	CK_3XXX),
 	CLK(NULL,	"core_96m_fck",	&core_96m_fck,	CK_3XXX),
@@ -3333,7 +3333,7 @@ static struct omap_clk omap3xxx_clks[] = {
 	CLK(NULL,	"pka_ick",	&pka_ick,	CK_34XX | CK_36XX),
 	CLK(NULL,	"core_l4_ick",	&core_l4_ick,	CK_3XXX),
 	CLK(NULL,	"usbtll_ick",	&usbtll_ick,	CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
-	CLK("usbhs_omap",	"usbtll_ick",	&usbtll_ick,	CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
+	CLK("usbhs_tll",	"usbtll_ick",	&usbtll_ick,	CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
 	CLK("omap_hsmmc.2",	"ick",	&mmchs3_ick,	CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
 	CLK(NULL,	"icr_ick",	&icr_ick,	CK_34XX | CK_36XX),
 	CLK("omap-aes",	"ick",	&aes2_ick,	CK_34XX | CK_36XX),
@@ -3388,9 +3388,9 @@ static struct omap_clk omap3xxx_clks[] = {
 	CLK("usbhs_omap",	"xclk60mhsp2_ck",	&dummy_ck,	CK_3XXX),
 	CLK("usbhs_omap",	"usb_host_hs_utmi_p1_clk",	&dummy_ck,	CK_3XXX),
 	CLK("usbhs_omap",	"usb_host_hs_utmi_p2_clk",	&dummy_ck,	CK_3XXX),
-	CLK("usbhs_omap",	"usb_tll_hs_usb_ch0_clk",	&dummy_ck,	CK_3XXX),
-	CLK("usbhs_omap",	"usb_tll_hs_usb_ch1_clk",	&dummy_ck,	CK_3XXX),
 	CLK("usbhs_omap",	"init_60m_fclk",	&dummy_ck,	CK_3XXX),
+	CLK("usbhs_tll",	"usb_tll_hs_usb_ch0_clk",	&dummy_ck,	CK_3XXX),
+	CLK("usbhs_tll",	"usb_tll_hs_usb_ch1_clk",	&dummy_ck,	CK_3XXX),
 	CLK(NULL,	"usim_fck",	&usim_fck,	CK_3430ES2PLUS | CK_36XX),
 	CLK(NULL,	"gpt1_fck",	&gpt1_fck,	CK_3XXX),
 	CLK(NULL,	"wkup_32k_fck",	&wkup_32k_fck,	CK_3XXX),
diff --git a/arch/arm/mach-omap2/clock44xx_data.c b/arch/arm/mach-omap2/clock44xx_data.c
index 08e86d7..3b6cf13 100644
--- a/arch/arm/mach-omap2/clock44xx_data.c
+++ b/arch/arm/mach-omap2/clock44xx_data.c
@@ -3323,7 +3323,7 @@ static struct omap_clk omap44xx_clks[] = {
 	CLK(NULL,	"usb_tll_hs_usb_ch2_clk",	&usb_tll_hs_usb_ch2_clk,	CK_443X),
 	CLK(NULL,	"usb_tll_hs_usb_ch0_clk",	&usb_tll_hs_usb_ch0_clk,	CK_443X),
 	CLK(NULL,	"usb_tll_hs_usb_ch1_clk",	&usb_tll_hs_usb_ch1_clk,	CK_443X),
-	CLK("usbhs_omap",	"usbtll_ick",		&usb_tll_hs_ick,	CK_443X),
+	CLK("usbhs_tll",	"usbtll_ick",		&usb_tll_hs_ick,	CK_443X),
 	CLK(NULL,	"usim_ck",			&usim_ck,	CK_443X),
 	CLK(NULL,	"usim_fclk",			&usim_fclk,	CK_443X),
 	CLK(NULL,	"usim_fck",			&usim_fck,	CK_443X),
@@ -3384,7 +3384,7 @@ static struct omap_clk omap44xx_clks[] = {
 	CLK(NULL,	"uart3_ick",			&dummy_ck,	CK_443X),
 	CLK(NULL,	"uart4_ick",			&dummy_ck,	CK_443X),
 	CLK("usbhs_omap",	"usbhost_ick",		&dummy_ck,		CK_443X),
-	CLK("usbhs_omap",	"usbtll_fck",		&dummy_ck,	CK_443X),
+	CLK("usbhs_tll",	"usbtll_fck",		&dummy_ck,	CK_443X),
 	CLK("omap_wdt",	"ick",				&dummy_ck,	CK_443X),
 	CLK("omap_timer.1",	"32k_ck",	&sys_32k_ck,	CK_443X),
 	CLK("omap_timer.2",	"32k_ck",	&sys_32k_ck,	CK_443X),
-- 
1.6.0.4

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

Re: [PATCH 1/5 RESEND] ARM: OMAP: USB: HOST TLL platform driver

[Shubhrajyoti]

Hi Keshava,
Some doubts / comments .
On Monday 19 March 2012 12:18 PM, Keshava Munegowda wrote:
> From: Keshava Munegowda <Keshava_mgowda@ti.com>
>
> The platform driver for the TLL component of the OMAP USB host controller
> is implemented. Depending on the TLL hardware revision , the TLL channels
> are configured. The USB HS core driver uses this driver through exported
> APIs from the TLL platform driver.
> usb_tll_enable and usb_tll_disble are the exported APIs of the USB TLL
> platform driver.
>
> Signed-off-by: Keshava Munegowda <keshava_mgowda@ti.com>
> Reviewed-by: Partha Basak <parthab@india.ti.com>
> ---
>  arch/arm/plat-omap/include/plat/usb.h |    8 +
>  drivers/mfd/Kconfig                   |    2 +-
>  drivers/mfd/Makefile                  |    2 +-
>  drivers/mfd/omap-usb-tll.c            |  463 +++++++++++++++++++++++++++++++++
>  4 files changed, 473 insertions(+), 2 deletions(-)
>  create mode 100644 drivers/mfd/omap-usb-tll.c
>
> diff --git a/arch/arm/plat-omap/include/plat/usb.h b/arch/arm/plat-omap/include/plat/usb.h
> index dc864b5..eb1e47d 100644
> --- a/arch/arm/plat-omap/include/plat/usb.h
> +++ b/arch/arm/plat-omap/include/plat/usb.h
> @@ -61,6 +61,10 @@ struct usbhs_omap_platform_data {
>  	struct ehci_hcd_omap_platform_data	*ehci_data;
>  	struct ohci_hcd_omap_platform_data	*ohci_data;
>  };
> +
> +struct usbtll_omap_platform_data {
> +	enum usbhs_omap_port_mode		port_mode[OMAP3_HS_USB_PORTS];
> +};
>  /*-------------------------------------------------------------------------*/
>  
>  #define OMAP1_OTG_BASE			0xfffb0400
> @@ -105,6 +109,10 @@ extern int omap4430_phy_set_clk(struct device *dev, int on);
>  extern int omap4430_phy_init(struct device *dev);
>  extern int omap4430_phy_exit(struct device *dev);
>  extern int omap4430_phy_suspend(struct device *dev, int suspend);
> +
> +extern int omap_tll_enable(void);
> +extern int omap_tll_disable(void);
> +
>  #endif
>  
>  extern void am35x_musb_reset(void);
> diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
> index f147395..5f75ad4 100644
> --- a/drivers/mfd/Kconfig
> +++ b/drivers/mfd/Kconfig
> @@ -772,7 +772,7 @@ config MFD_WL1273_CORE
>  	  audio codec.
>  
>  config MFD_OMAP_USB_HOST
> -	bool "Support OMAP USBHS core driver"
> +	bool "Support OMAP USBHS core and TLL driver"
>  	depends on USB_EHCI_HCD_OMAP || USB_OHCI_HCD_OMAP3
>  	default y
>  	help
> diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
> index b953bab..4b3a8e0 100644
> --- a/drivers/mfd/Makefile
> +++ b/drivers/mfd/Makefile
> @@ -105,7 +105,7 @@ obj-$(CONFIG_MFD_TPS6586X)	+= tps6586x.o
>  obj-$(CONFIG_MFD_VX855)		+= vx855.o
>  obj-$(CONFIG_MFD_WL1273_CORE)	+= wl1273-core.o
>  obj-$(CONFIG_MFD_CS5535)	+= cs5535-mfd.o
> -obj-$(CONFIG_MFD_OMAP_USB_HOST)	+= omap-usb-host.o
> +obj-$(CONFIG_MFD_OMAP_USB_HOST)	+= omap-usb-host.o omap-usb-tll.o
>  obj-$(CONFIG_MFD_PM8921_CORE) 	+= pm8921-core.o
>  obj-$(CONFIG_MFD_PM8XXX_IRQ) 	+= pm8xxx-irq.o
>  obj-$(CONFIG_TPS65911_COMPARATOR)	+= tps65911-comparator.o
> diff --git a/drivers/mfd/omap-usb-tll.c b/drivers/mfd/omap-usb-tll.c
> new file mode 100644
> index 0000000..3da468a
> --- /dev/null
> +++ b/drivers/mfd/omap-usb-tll.c
> @@ -0,0 +1,463 @@
> +/**
> + * omap-usb-tll.c - The USB TLL driver for OMAP EHCI & OHCI
> + *
> + * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com
Nitpick : 2012
> + * Author: Keshava Munegowda <keshava_mgowda@ti.com>
> + *
> + * This program is free software: you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2  of
> + * the License as published by the Free Software Foundation.
> + *
> + * 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, see <http://www.gnu.org/licenses/>.
> + */
> +#include <linux/kernel.h>
> +#include <linux/module.h>
> +#include <linux/types.h>
> +#include <linux/slab.h>
> +#include <linux/spinlock.h>
> +#include <linux/platform_device.h>
> +#include <linux/clk.h>
> +#include <linux/io.h>
> +#include <linux/err.h>
> +#include <plat/usb.h>
> +#include <linux/pm_runtime.h>
> +
> +#define USBTLL_DRIVER_NAME	"usbhs_tll"
> +
> +/* TLL Register Set */
> +#define	OMAP_USBTLL_REVISION				(0x00)
> +#define	OMAP_USBTLL_SYSCONFIG				(0x10)
> +#define	OMAP_USBTLL_SYSCONFIG_CACTIVITY			(1 << 8)
> +#define	OMAP_USBTLL_SYSCONFIG_SIDLEMODE			(1 << 3)
> +#define	OMAP_USBTLL_SYSCONFIG_ENAWAKEUP			(1 << 2)
> +#define	OMAP_USBTLL_SYSCONFIG_SOFTRESET			(1 << 1)
> +#define	OMAP_USBTLL_SYSCONFIG_AUTOIDLE			(1 << 0)
> +
> +#define	OMAP_USBTLL_SYSSTATUS				(0x14)
> +#define	OMAP_USBTLL_SYSSTATUS_RESETDONE			(1 << 0)
> +
> +#define	OMAP_USBTLL_IRQSTATUS				(0x18)
> +#define	OMAP_USBTLL_IRQENABLE				(0x1C)
> +
> +#define	OMAP_TLL_SHARED_CONF				(0x30)
> +#define	OMAP_TLL_SHARED_CONF_USB_90D_DDR_EN		(1 << 6)
> +#define	OMAP_TLL_SHARED_CONF_USB_180D_SDR_EN		(1 << 5)
> +#define	OMAP_TLL_SHARED_CONF_USB_DIVRATION		(1 << 2)
> +#define	OMAP_TLL_SHARED_CONF_FCLK_REQ			(1 << 1)
> +#define	OMAP_TLL_SHARED_CONF_FCLK_IS_ON			(1 << 0)
> +
> +#define	OMAP_TLL_CHANNEL_CONF(num)			(0x040 + 0x004 * num)
> +#define OMAP_TLL_CHANNEL_CONF_FSLSMODE_SHIFT		24
> +#define	OMAP_TLL_CHANNEL_CONF_ULPINOBITSTUFF		(1 << 11)
> +#define	OMAP_TLL_CHANNEL_CONF_ULPI_ULPIAUTOIDLE		(1 << 10)
> +#define	OMAP_TLL_CHANNEL_CONF_UTMIAUTOIDLE		(1 << 9)
> +#define	OMAP_TLL_CHANNEL_CONF_ULPIDDRMODE		(1 << 8)
> +#define OMAP_TLL_CHANNEL_CONF_CHANMODE_FSLS		(1 << 1)
> +#define	OMAP_TLL_CHANNEL_CONF_CHANEN			(1 << 0)
> +
> +#define OMAP_TLL_FSLSMODE_6PIN_PHY_DAT_SE0		0x0
> +#define OMAP_TLL_FSLSMODE_6PIN_PHY_DP_DM		0x1
> +#define OMAP_TLL_FSLSMODE_3PIN_PHY			0x2
> +#define OMAP_TLL_FSLSMODE_4PIN_PHY			0x3
> +#define OMAP_TLL_FSLSMODE_6PIN_TLL_DAT_SE0		0x4
> +#define OMAP_TLL_FSLSMODE_6PIN_TLL_DP_DM		0x5
> +#define OMAP_TLL_FSLSMODE_3PIN_TLL			0x6
> +#define OMAP_TLL_FSLSMODE_4PIN_TLL			0x7
> +#define OMAP_TLL_FSLSMODE_2PIN_TLL_DAT_SE0		0xA
> +#define OMAP_TLL_FSLSMODE_2PIN_DAT_DP_DM		0xB
> +
> +#define	OMAP_TLL_ULPI_FUNCTION_CTRL(num)		(0x804 + 0x100 * num)
> +#define	OMAP_TLL_ULPI_INTERFACE_CTRL(num)		(0x807 + 0x100 * num)
> +#define	OMAP_TLL_ULPI_OTG_CTRL(num)			(0x80A + 0x100 * num)
> +#define	OMAP_TLL_ULPI_INT_EN_RISE(num)			(0x80D + 0x100 * num)
> +#define	OMAP_TLL_ULPI_INT_EN_FALL(num)			(0x810 + 0x100 * num)
> +#define	OMAP_TLL_ULPI_INT_STATUS(num)			(0x813 + 0x100 * num)
> +#define	OMAP_TLL_ULPI_INT_LATCH(num)			(0x814 + 0x100 * num)
> +#define	OMAP_TLL_ULPI_DEBUG(num)			(0x815 + 0x100 * num)
> +#define	OMAP_TLL_ULPI_SCRATCH_REGISTER(num)		(0x816 + 0x100 * num)
> +
> +#define OMAP_REV2_TLL_CHANNEL_COUNT			2
> +#define OMAP_TLL_CHANNEL_COUNT				3
> +#define OMAP_TLL_CHANNEL_1_EN_MASK			(1 << 0)
> +#define OMAP_TLL_CHANNEL_2_EN_MASK			(1 << 1)
> +#define OMAP_TLL_CHANNEL_3_EN_MASK			(1 << 2)
> +
> +/* Values of USBTLL_REVISION - Note: these are not given in the TRM */
How are these values found? experimentally ?
> +#define OMAP_USBTLL_REV1		0x00000015	/* OMAP3 */
> +#define OMAP_USBTLL_REV2		0x00000004	/* OMAP4 */
> +
<snip>

+	else if (ver == OMAP_USBTLL_REV2)
+		count = OMAP_REV2_TLL_CHANNEL_COUNT;
+	else {
+		dev_err(dev, "TLL version failed\n");
+		ret = -ENODEV;
+		goto err_ioremap;
+	}


<Snip>


> +
> +err_ioremap:
> +	spin_unlock_irqrestore(&tll->lock, flags);
> +	iounmap(base);
> +	pm_runtime_put_sync(dev);
> +	tll_pdev = pdev;
> +	if (!ret)
> +		goto end;
Did not understand this check as ret is made -ENODEV so this is always true?
Am I missing something?
> +	pm_runtime_disable(dev);
> +
> +err_usbtll_p2_fck:
> +	clk_put(tll->usbtll_p2_fck);
> +
> +err_usbtll_p1_fck:
> +	clk_put(tll->usbtll_p1_fck);
> +
> +err_tll:
> +	kfree(tll);
> +
> +end:
> +	return ret;
> +}
> +
> +/**
> + * usbtll_omap_remove - shutdown processing for UHH & TLL HCDs
> + * @pdev: USB Host Controller being removed
> + *
> + * Reverses the effect of usbtll_omap_probe().
> + */
> +static int __devexit usbtll_omap_remove(struct platform_device *pdev)
> +{
> +	struct usbtll_omap *tll = platform_get_drvdata(pdev);
> +
> +	clk_put(tll->usbtll_p2_fck);
> +	clk_put(tll->usbtll_p1_fck);
> +	pm_runtime_disable(&pdev->dev);
> +	kfree(tll);
> +	return 0;
> +}
> +
> +static int usbtll_runtime_resume(struct device *dev)
> +{
> +	struct usbtll_omap			*tll = dev_get_drvdata(dev);
> +	struct usbtll_omap_platform_data	*pdata = &tll->platdata;
> +	unsigned long				flags;
> +
> +	dev_dbg(dev, "usbtll_runtime_resume\n");
> +
> +	if (!pdata) {
> +		dev_dbg(dev, "missing platform_data\n");
> +		return  -ENODEV;
> +	}
> +
> +	spin_lock_irqsave(&tll->lock, flags);
> +
> +	if (is_ehci_tll_mode(pdata->port_mode[0]))
> +		clk_enable(tll->usbtll_p1_fck);
> +
> +	if (is_ehci_tll_mode(pdata->port_mode[1]))
> +		clk_enable(tll->usbtll_p2_fck);
> +
> +	spin_unlock_irqrestore(&tll->lock, flags);
> +
> +	return 0;
> +}
> +
> +static int usbtll_runtime_suspend(struct device *dev)
> +{
> +	struct usbtll_omap			*tll = dev_get_drvdata(dev);
> +	struct usbtll_omap_platform_data	*pdata = &tll->platdata;
> +	unsigned long				flags;
> +
> +	dev_dbg(dev, "usbtll_runtime_suspend\n");
> +
> +	if (!pdata) {
> +		dev_dbg(dev, "missing platform_data\n");
> +		return  -ENODEV;
> +	}
> +
> +	spin_lock_irqsave(&tll->lock, flags);
> +
> +	if (is_ehci_tll_mode(pdata->port_mode[0]))
> +		clk_disable(tll->usbtll_p1_fck);
> +
> +	if (is_ehci_tll_mode(pdata->port_mode[1]))
> +		clk_disable(tll->usbtll_p2_fck);
> +
> +	spin_unlock_irqrestore(&tll->lock, flags);
> +
> +	return 0;
> +}
> +
> +static const struct dev_pm_ops usbtllomap_dev_pm_ops = {
> +	.runtime_suspend	= usbtll_runtime_suspend,
> +	.runtime_resume		= usbtll_runtime_resume,
> +};
> +
Also how about using runtime_pm_ops ?

Re: [PATCH 1/5 RESEND] ARM: OMAP: USB: HOST TLL platform driver

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 1821 bytes --]

Hi,

On Mon, Mar 19, 2012 at 12:18:31PM +0530, Keshava Munegowda wrote:
> +	ver =  usbtll_read(base, OMAP_USBTLL_REVISION);
> +	if (ver == OMAP_USBTLL_REV1)
> +		count = OMAP_TLL_CHANNEL_COUNT;
> +	else if (ver == OMAP_USBTLL_REV2)
> +		count = OMAP_REV2_TLL_CHANNEL_COUNT;
> +	else {
> +		dev_err(dev, "TLL version failed\n");
> +		ret = -ENODEV;
> +		goto err_ioremap;
> +	}

wrong coding style.

> +static const struct dev_pm_ops usbtllomap_dev_pm_ops = {
> +	.runtime_suspend	= usbtll_runtime_suspend,
> +	.runtime_resume		= usbtll_runtime_resume,

use SET_RUNTIME_PM_OPS()

> +static struct platform_driver usbtll_omap_driver = {
> +	.driver = {
> +		.name		= (char *)usbtll_driver_name,
> +		.owner		= THIS_MODULE,
> +		.pm		= &usbtllomap_dev_pm_ops,
> +	},
> +	.remove		= __exit_p(usbtll_omap_remove),

__devexit_p()

> +};
> +
> +int omap_tll_enable(void)
> +{
> +	if (!tll_pdev) {
> +		dev_dbg(&tll_pdev->dev, "missing platform_data\n");
> +		return  -ENODEV;
> +	}
> +	return pm_runtime_get_sync(&tll_pdev->dev);
> +}
> +EXPORT_SYMBOL_GPL(omap_tll_enable);

why ?

> +
> +int omap_tll_disable(void)
> +{
> +	if (!tll_pdev) {
> +		dev_dbg(&tll_pdev->dev, "missing platform_data\n");
> +		return  -ENODEV;
> +	}
> +	return pm_runtime_put_sync(&tll_pdev->dev);
> +}
> +EXPORT_SYMBOL_GPL(omap_tll_disable);

why ?

> +MODULE_AUTHOR("Keshava Munegowda <keshava_mgowda@ti.com>");
> +MODULE_ALIAS("platform:" USBHS_DRIVER_NAME);
> +MODULE_LICENSE("GPL v2");
> +MODULE_DESCRIPTION("usb tll driver for TI OMAP EHCI and OHCI controllers");
> +
> +static int __init omap_usbtll_drvinit(void)
> +{
> +	return platform_driver_probe(&usbtll_omap_driver, usbtll_omap_probe);

please don't. Make sure you use platform_driver_register, instead.

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH 2/5 RESEND] ARM: OMAP: USB: Build the USB HOST TLL omap device

[Sergei Shtylyov]

Hello.

On 19-03-2012 10:48, Keshava Munegowda wrote:

> From: Keshava Munegowda<Keshava_mgowda@ti.com>

> The hwmod of the usb tll is retrieved and omap device build is
> performed to created the platform device for the usb tll component.

> Signed-off-by: Keshava Munegowda<keshava_mgowda@ti.com>
> Reviewed-by: Partha Basak<parthab@india.ti.com>
> ---
>   arch/arm/mach-omap2/usb-host.c |   28 ++++++++++++++++++++--------
>   1 files changed, 20 insertions(+), 8 deletions(-)

> diff --git a/arch/arm/mach-omap2/usb-host.c b/arch/arm/mach-omap2/usb-host.c
> index f51348d..dc6769a 100644
> --- a/arch/arm/mach-omap2/usb-host.c
> +++ b/arch/arm/mach-omap2/usb-host.c
[...]
> @@ -510,25 +512,35 @@ void __init usbhs_init(const struct usbhs_omap_board_data *pdata)
[...]
> -	pdev = omap_device_build_ss(OMAP_USBHS_DEVICE, bus_id, oh, 2,
> +	pdev = omap_device_build(OMAP_USBTLL_DEVICE, bus_id, tll_hwm,
> +				(void *)&usbtll_data, sizeof(usbtll_data),

    There's no need to explicitly cast to 'void *'. The cast is automatic.

> +				omap_uhhtll_latency,
> +				ARRAY_SIZE(omap_uhhtll_latency), false);
> +	if (IS_ERR(pdev)) {
> +		pr_err("Could not build hwmod device %s\n",
> +			USBHS_TLL_HWMODNAME);
> +		return;
> +	}
> +
> +	pdev = omap_device_build(OMAP_USBHS_DEVICE, bus_id, uhh_hwm,
>   				(void *)&usbhs_data, sizeof(usbhs_data),

    Same here.

WBR, Sergei

Re: [PATCH 4/5 RESEND] ARM: OMAP: USB: Invoke the TLL driver from USB HS core driver

[Sergei Shtylyov]

Hello.

On 19-03-2012 10:48, Keshava Munegowda wrote:

> From: Keshava Munegowda<Keshava_mgowda@ti.com>

> The usbhs driver invokes the enable/disable APIs of the
> usb tll driver in the runtime resume/suspend callbacks
> of the runtime get sync and put sync of the usbhs driver.

> Signed-off-by: Keshava Munegowda<keshava_mgowda@ti.com>
> Reviewed-by: Partha Basak<parthab@india.ti.com>
> ---
>   arch/arm/plat-omap/include/plat/usb.h |    1 +
>   drivers/mfd/omap-usb-host.c           |    7 +++++--
>   2 files changed, 6 insertions(+), 2 deletions(-)

> diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
> index 4de87c6..9d84339 100644
> --- a/drivers/mfd/omap-usb-host.c
> +++ b/drivers/mfd/omap-usb-host.c
[...]
> @@ -655,8 +656,10 @@ static int __init omap_usbhs_drvinit(void)
>   * init before ehci and ohci drivers;
>   * The usbhs core driver should be initialized much before
>   * the omap ehci and ohci probe functions are called.
> + * this usbhs core driver should be initialized after

    s/this/This/

> + * usb tll driver.

WBR, Sergei

Re: [PATCH 1/5 RESEND] ARM: OMAP: USB: HOST TLL platform driver

[Sergei Shtylyov]

Hello.

On 19-03-2012 14:06, Felipe Balbi wrote:

>> +	ver =  usbtll_read(base, OMAP_USBTLL_REVISION);
>> +	if (ver == OMAP_USBTLL_REV1)
>> +		count = OMAP_TLL_CHANNEL_COUNT;
>> +	else if (ver == OMAP_USBTLL_REV2)
>> +		count = OMAP_REV2_TLL_CHANNEL_COUNT;
>> +	else {
>> +		dev_err(dev, "TLL version failed\n");
>> +		ret = -ENODEV;
>> +		goto err_ioremap;
>> +	}

> wrong coding style.

    And *switch* seems more fitting here.

WBR, Sergei

Re: [PATCH 1/5 RESEND] ARM: OMAP: USB: HOST TLL platform driver

[Munegowda, Keshava]

On Mon, Mar 19, 2012 at 4:39 PM, Sergei Shtylyov <sshtylyov-Igf4POYTYCDQT0dZR+AlfA@public.gmane.org> wrote:
> Hello.
>
>
> On 19-03-2012 14:06, Felipe Balbi wrote:
>
>>> +       ver =  usbtll_read(base, OMAP_USBTLL_REVISION);
>>> +       if (ver == OMAP_USBTLL_REV1)
>>> +               count = OMAP_TLL_CHANNEL_COUNT;
>>> +       else if (ver == OMAP_USBTLL_REV2)
>>> +               count = OMAP_REV2_TLL_CHANNEL_COUNT;
>>> +       else {
>>> +               dev_err(dev, "TLL version failed\n");
>>> +               ret = -ENODEV;
>>> +               goto err_ioremap;
>>> +       }
>
>
>> wrong coding style.
>
>
>   And *switch* seems more fitting here.
>
> WBR, Sergei

Thanks , I will do this,
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/5 RESEND] ARM: OMAP: USB: HOST TLL platform driver

[Munegowda, Keshava]

On Mon, Mar 19, 2012 at 3:11 PM, Shubhrajyoti <shubhrajyoti-l0cyMroinI0@public.gmane.org> wrote:
> Hi Keshava,
> Some doubts / comments .
> On Monday 19 March 2012 12:18 PM, Keshava Munegowda wrote:
>> From: Keshava Munegowda <Keshava_mgowda-l0cyMroinI0@public.gmane.org>
>>
>> The platform driver for the TLL component of the OMAP USB host controller
>> is implemented. Depending on the TLL hardware revision , the TLL channels
>> are configured. The USB HS core driver uses this driver through exported
>> APIs from the TLL platform driver.
>> usb_tll_enable and usb_tll_disble are the exported APIs of the USB TLL
>> platform driver.
>>
>> Signed-off-by: Keshava Munegowda <keshava_mgowda-l0cyMroinI0@public.gmane.org>
>> Reviewed-by: Partha Basak <parthab-PpE0FKYn9XJWk0Htik3J/w@public.gmane.org>
>> ---
>>  arch/arm/plat-omap/include/plat/usb.h |    8 +
>>  drivers/mfd/Kconfig                   |    2 +-
>>  drivers/mfd/Makefile                  |    2 +-
>>  drivers/mfd/omap-usb-tll.c            |  463 +++++++++++++++++++++++++++++++++
>>  4 files changed, 473 insertions(+), 2 deletions(-)
>>  create mode 100644 drivers/mfd/omap-usb-tll.c
>>
>> diff --git a/arch/arm/plat-omap/include/plat/usb.h b/arch/arm/plat-omap/include/plat/usb.h
>> index dc864b5..eb1e47d 100644
>> --- a/arch/arm/plat-omap/include/plat/usb.h
>> +++ b/arch/arm/plat-omap/include/plat/usb.h
>> @@ -61,6 +61,10 @@ struct usbhs_omap_platform_data {
>>       struct ehci_hcd_omap_platform_data      *ehci_data;
>>       struct ohci_hcd_omap_platform_data      *ohci_data;
>>  };
>> +
>> +struct usbtll_omap_platform_data {
>> +     enum usbhs_omap_port_mode               port_mode[OMAP3_HS_USB_PORTS];
>> +};
>>  /*-------------------------------------------------------------------------*/
>>
>>  #define OMAP1_OTG_BASE                       0xfffb0400
>> @@ -105,6 +109,10 @@ extern int omap4430_phy_set_clk(struct device *dev, int on);
>>  extern int omap4430_phy_init(struct device *dev);
>>  extern int omap4430_phy_exit(struct device *dev);
>>  extern int omap4430_phy_suspend(struct device *dev, int suspend);
>> +
>> +extern int omap_tll_enable(void);
>> +extern int omap_tll_disable(void);
>> +
>>  #endif
>>
>>  extern void am35x_musb_reset(void);
>> diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
>> index f147395..5f75ad4 100644
>> --- a/drivers/mfd/Kconfig
>> +++ b/drivers/mfd/Kconfig
>> @@ -772,7 +772,7 @@ config MFD_WL1273_CORE
>>         audio codec.
>>
>>  config MFD_OMAP_USB_HOST
>> -     bool "Support OMAP USBHS core driver"
>> +     bool "Support OMAP USBHS core and TLL driver"
>>       depends on USB_EHCI_HCD_OMAP || USB_OHCI_HCD_OMAP3
>>       default y
>>       help
>> diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
>> index b953bab..4b3a8e0 100644
>> --- a/drivers/mfd/Makefile
>> +++ b/drivers/mfd/Makefile
>> @@ -105,7 +105,7 @@ obj-$(CONFIG_MFD_TPS6586X)        += tps6586x.o
>>  obj-$(CONFIG_MFD_VX855)              += vx855.o
>>  obj-$(CONFIG_MFD_WL1273_CORE)        += wl1273-core.o
>>  obj-$(CONFIG_MFD_CS5535)     += cs5535-mfd.o
>> -obj-$(CONFIG_MFD_OMAP_USB_HOST)      += omap-usb-host.o
>> +obj-$(CONFIG_MFD_OMAP_USB_HOST)      += omap-usb-host.o omap-usb-tll.o
>>  obj-$(CONFIG_MFD_PM8921_CORE)        += pm8921-core.o
>>  obj-$(CONFIG_MFD_PM8XXX_IRQ)         += pm8xxx-irq.o
>>  obj-$(CONFIG_TPS65911_COMPARATOR)    += tps65911-comparator.o
>> diff --git a/drivers/mfd/omap-usb-tll.c b/drivers/mfd/omap-usb-tll.c
>> new file mode 100644
>> index 0000000..3da468a
>> --- /dev/null
>> +++ b/drivers/mfd/omap-usb-tll.c
>> @@ -0,0 +1,463 @@
>> +/**
>> + * omap-usb-tll.c - The USB TLL driver for OMAP EHCI & OHCI
>> + *
>> + * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com
> Nitpick : 2012
>> + * Author: Keshava Munegowda <keshava_mgowda-l0cyMroinI0@public.gmane.org>
>> + *
>> + * This program is free software: you can redistribute it and/or modify
>> + * it under the terms of the GNU General Public License version 2  of
>> + * the License as published by the Free Software Foundation.
>> + *
>> + * 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, see <http://www.gnu.org/licenses/>.
>> + */
>> +#include <linux/kernel.h>
>> +#include <linux/module.h>
>> +#include <linux/types.h>
>> +#include <linux/slab.h>
>> +#include <linux/spinlock.h>
>> +#include <linux/platform_device.h>
>> +#include <linux/clk.h>
>> +#include <linux/io.h>
>> +#include <linux/err.h>
>> +#include <plat/usb.h>
>> +#include <linux/pm_runtime.h>
>> +
>> +#define USBTLL_DRIVER_NAME   "usbhs_tll"
>> +
>> +/* TLL Register Set */
>> +#define      OMAP_USBTLL_REVISION                            (0x00)
>> +#define      OMAP_USBTLL_SYSCONFIG                           (0x10)
>> +#define      OMAP_USBTLL_SYSCONFIG_CACTIVITY                 (1 << 8)
>> +#define      OMAP_USBTLL_SYSCONFIG_SIDLEMODE                 (1 << 3)
>> +#define      OMAP_USBTLL_SYSCONFIG_ENAWAKEUP                 (1 << 2)
>> +#define      OMAP_USBTLL_SYSCONFIG_SOFTRESET                 (1 << 1)
>> +#define      OMAP_USBTLL_SYSCONFIG_AUTOIDLE                  (1 << 0)
>> +
>> +#define      OMAP_USBTLL_SYSSTATUS                           (0x14)
>> +#define      OMAP_USBTLL_SYSSTATUS_RESETDONE                 (1 << 0)
>> +
>> +#define      OMAP_USBTLL_IRQSTATUS                           (0x18)
>> +#define      OMAP_USBTLL_IRQENABLE                           (0x1C)
>> +
>> +#define      OMAP_TLL_SHARED_CONF                            (0x30)
>> +#define      OMAP_TLL_SHARED_CONF_USB_90D_DDR_EN             (1 << 6)
>> +#define      OMAP_TLL_SHARED_CONF_USB_180D_SDR_EN            (1 << 5)
>> +#define      OMAP_TLL_SHARED_CONF_USB_DIVRATION              (1 << 2)
>> +#define      OMAP_TLL_SHARED_CONF_FCLK_REQ                   (1 << 1)
>> +#define      OMAP_TLL_SHARED_CONF_FCLK_IS_ON                 (1 << 0)
>> +
>> +#define      OMAP_TLL_CHANNEL_CONF(num)                      (0x040 + 0x004 * num)
>> +#define OMAP_TLL_CHANNEL_CONF_FSLSMODE_SHIFT         24
>> +#define      OMAP_TLL_CHANNEL_CONF_ULPINOBITSTUFF            (1 << 11)
>> +#define      OMAP_TLL_CHANNEL_CONF_ULPI_ULPIAUTOIDLE         (1 << 10)
>> +#define      OMAP_TLL_CHANNEL_CONF_UTMIAUTOIDLE              (1 << 9)
>> +#define      OMAP_TLL_CHANNEL_CONF_ULPIDDRMODE               (1 << 8)
>> +#define OMAP_TLL_CHANNEL_CONF_CHANMODE_FSLS          (1 << 1)
>> +#define      OMAP_TLL_CHANNEL_CONF_CHANEN                    (1 << 0)
>> +
>> +#define OMAP_TLL_FSLSMODE_6PIN_PHY_DAT_SE0           0x0
>> +#define OMAP_TLL_FSLSMODE_6PIN_PHY_DP_DM             0x1
>> +#define OMAP_TLL_FSLSMODE_3PIN_PHY                   0x2
>> +#define OMAP_TLL_FSLSMODE_4PIN_PHY                   0x3
>> +#define OMAP_TLL_FSLSMODE_6PIN_TLL_DAT_SE0           0x4
>> +#define OMAP_TLL_FSLSMODE_6PIN_TLL_DP_DM             0x5
>> +#define OMAP_TLL_FSLSMODE_3PIN_TLL                   0x6
>> +#define OMAP_TLL_FSLSMODE_4PIN_TLL                   0x7
>> +#define OMAP_TLL_FSLSMODE_2PIN_TLL_DAT_SE0           0xA
>> +#define OMAP_TLL_FSLSMODE_2PIN_DAT_DP_DM             0xB
>> +
>> +#define      OMAP_TLL_ULPI_FUNCTION_CTRL(num)                (0x804 + 0x100 * num)
>> +#define      OMAP_TLL_ULPI_INTERFACE_CTRL(num)               (0x807 + 0x100 * num)
>> +#define      OMAP_TLL_ULPI_OTG_CTRL(num)                     (0x80A + 0x100 * num)
>> +#define      OMAP_TLL_ULPI_INT_EN_RISE(num)                  (0x80D + 0x100 * num)
>> +#define      OMAP_TLL_ULPI_INT_EN_FALL(num)                  (0x810 + 0x100 * num)
>> +#define      OMAP_TLL_ULPI_INT_STATUS(num)                   (0x813 + 0x100 * num)
>> +#define      OMAP_TLL_ULPI_INT_LATCH(num)                    (0x814 + 0x100 * num)
>> +#define      OMAP_TLL_ULPI_DEBUG(num)                        (0x815 + 0x100 * num)
>> +#define      OMAP_TLL_ULPI_SCRATCH_REGISTER(num)             (0x816 + 0x100 * num)
>> +
>> +#define OMAP_REV2_TLL_CHANNEL_COUNT                  2
>> +#define OMAP_TLL_CHANNEL_COUNT                               3
>> +#define OMAP_TLL_CHANNEL_1_EN_MASK                   (1 << 0)
>> +#define OMAP_TLL_CHANNEL_2_EN_MASK                   (1 << 1)
>> +#define OMAP_TLL_CHANNEL_3_EN_MASK                   (1 << 2)
>> +
>> +/* Values of USBTLL_REVISION - Note: these are not given in the TRM */
> How are these values found? experimentally ?

yes,


>> +#define OMAP_USBTLL_REV1             0x00000015      /* OMAP3 */
>> +#define OMAP_USBTLL_REV2             0x00000004      /* OMAP4 */
>> +
> <snip>
>
> +       else if (ver == OMAP_USBTLL_REV2)
> +               count = OMAP_REV2_TLL_CHANNEL_COUNT;
> +       else {
> +               dev_err(dev, "TLL version failed\n");
> +               ret = -ENODEV;
> +               goto err_ioremap;
> +       }
>
>
> <Snip>
>
>
>> +
>> +err_ioremap:
>> +     spin_unlock_irqrestore(&tll->lock, flags);
>> +     iounmap(base);
>> +     pm_runtime_put_sync(dev);
>> +     tll_pdev = pdev;
>> +     if (!ret)
>> +             goto end;
> Did not understand this check as ret is made -ENODEV so this is always true?
> Am I missing something?

I need to check this.

>> +     pm_runtime_disable(dev);
>> +
>> +err_usbtll_p2_fck:
>> +     clk_put(tll->usbtll_p2_fck);
>> +
>> +err_usbtll_p1_fck:
>> +     clk_put(tll->usbtll_p1_fck);
>> +
>> +err_tll:
>> +     kfree(tll);
>> +
>> +end:
>> +     return ret;
>> +}
>> +
>> +/**
>> + * usbtll_omap_remove - shutdown processing for UHH & TLL HCDs
>> + * @pdev: USB Host Controller being removed
>> + *
>> + * Reverses the effect of usbtll_omap_probe().
>> + */
>> +static int __devexit usbtll_omap_remove(struct platform_device *pdev)
>> +{
>> +     struct usbtll_omap *tll = platform_get_drvdata(pdev);
>> +
>> +     clk_put(tll->usbtll_p2_fck);
>> +     clk_put(tll->usbtll_p1_fck);
>> +     pm_runtime_disable(&pdev->dev);
>> +     kfree(tll);
>> +     return 0;
>> +}
>> +
>> +static int usbtll_runtime_resume(struct device *dev)
>> +{
>> +     struct usbtll_omap                      *tll = dev_get_drvdata(dev);
>> +     struct usbtll_omap_platform_data        *pdata = &tll->platdata;
>> +     unsigned long                           flags;
>> +
>> +     dev_dbg(dev, "usbtll_runtime_resume\n");
>> +
>> +     if (!pdata) {
>> +             dev_dbg(dev, "missing platform_data\n");
>> +             return  -ENODEV;
>> +     }
>> +
>> +     spin_lock_irqsave(&tll->lock, flags);
>> +
>> +     if (is_ehci_tll_mode(pdata->port_mode[0]))
>> +             clk_enable(tll->usbtll_p1_fck);
>> +
>> +     if (is_ehci_tll_mode(pdata->port_mode[1]))
>> +             clk_enable(tll->usbtll_p2_fck);
>> +
>> +     spin_unlock_irqrestore(&tll->lock, flags);
>> +
>> +     return 0;
>> +}
>> +
>> +static int usbtll_runtime_suspend(struct device *dev)
>> +{
>> +     struct usbtll_omap                      *tll = dev_get_drvdata(dev);
>> +     struct usbtll_omap_platform_data        *pdata = &tll->platdata;
>> +     unsigned long                           flags;
>> +
>> +     dev_dbg(dev, "usbtll_runtime_suspend\n");
>> +
>> +     if (!pdata) {
>> +             dev_dbg(dev, "missing platform_data\n");
>> +             return  -ENODEV;
>> +     }
>> +
>> +     spin_lock_irqsave(&tll->lock, flags);
>> +
>> +     if (is_ehci_tll_mode(pdata->port_mode[0]))
>> +             clk_disable(tll->usbtll_p1_fck);
>> +
>> +     if (is_ehci_tll_mode(pdata->port_mode[1]))
>> +             clk_disable(tll->usbtll_p2_fck);
>> +
>> +     spin_unlock_irqrestore(&tll->lock, flags);
>> +
>> +     return 0;
>> +}
>> +
>> +static const struct dev_pm_ops usbtllomap_dev_pm_ops = {
>> +     .runtime_suspend        = usbtll_runtime_suspend,
>> +     .runtime_resume         = usbtll_runtime_resume,
>> +};
>> +
> Also how about using runtime_pm_ops ?
Sorry I din't get this? what exact alternative are you suggesting here?
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/5 RESEND] ARM: OMAP: USB: HOST TLL platform driver

[Munegowda, Keshava]

On Mon, Mar 19, 2012 at 12:18 PM, Keshava Munegowda
<keshava_mgowda@ti.com> wrote:
> From: Keshava Munegowda <Keshava_mgowda@ti.com>
>
> The platform driver for the TLL component of the OMAP USB host controller
> is implemented. Depending on the TLL hardware revision , the TLL channels
> are configured. The USB HS core driver uses this driver through exported
> APIs from the TLL platform driver.
> usb_tll_enable and usb_tll_disble are the exported APIs of the USB TLL
> platform driver.
>
> Signed-off-by: Keshava Munegowda <keshava_mgowda@ti.com>
> Reviewed-by: Partha Basak <parthab@india.ti.com>
> ---
>  arch/arm/plat-omap/include/plat/usb.h |    8 +
>  drivers/mfd/Kconfig                   |    2 +-
>  drivers/mfd/Makefile                  |    2 +-
>  drivers/mfd/omap-usb-tll.c            |  463 +++++++++++++++++++++++++++++++++
>  4 files changed, 473 insertions(+), 2 deletions(-)
>  create mode 100644 drivers/mfd/omap-usb-tll.c
>
> diff --git a/arch/arm/plat-omap/include/plat/usb.h b/arch/arm/plat-omap/include/plat/usb.h
> index dc864b5..eb1e47d 100644
> --- a/arch/arm/plat-omap/include/plat/usb.h
> +++ b/arch/arm/plat-omap/include/plat/usb.h
> @@ -61,6 +61,10 @@ struct usbhs_omap_platform_data {
>        struct ehci_hcd_omap_platform_data      *ehci_data;
>        struct ohci_hcd_omap_platform_data      *ohci_data;
>  };
> +
> +struct usbtll_omap_platform_data {
> +       enum usbhs_omap_port_mode               port_mode[OMAP3_HS_USB_PORTS];
> +};
>  /*-------------------------------------------------------------------------*/
>
>  #define OMAP1_OTG_BASE                 0xfffb0400
> @@ -105,6 +109,10 @@ extern int omap4430_phy_set_clk(struct device *dev, int on);
>  extern int omap4430_phy_init(struct device *dev);
>  extern int omap4430_phy_exit(struct device *dev);
>  extern int omap4430_phy_suspend(struct device *dev, int suspend);
> +
> +extern int omap_tll_enable(void);
> +extern int omap_tll_disable(void);
> +
>  #endif
>
>  extern void am35x_musb_reset(void);
> diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
> index f147395..5f75ad4 100644
> --- a/drivers/mfd/Kconfig
> +++ b/drivers/mfd/Kconfig
> @@ -772,7 +772,7 @@ config MFD_WL1273_CORE
>          audio codec.
>
>  config MFD_OMAP_USB_HOST
> -       bool "Support OMAP USBHS core driver"
> +       bool "Support OMAP USBHS core and TLL driver"
>        depends on USB_EHCI_HCD_OMAP || USB_OHCI_HCD_OMAP3
>        default y
>        help
> diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
> index b953bab..4b3a8e0 100644
> --- a/drivers/mfd/Makefile
> +++ b/drivers/mfd/Makefile
> @@ -105,7 +105,7 @@ obj-$(CONFIG_MFD_TPS6586X)  += tps6586x.o
>  obj-$(CONFIG_MFD_VX855)                += vx855.o
>  obj-$(CONFIG_MFD_WL1273_CORE)  += wl1273-core.o
>  obj-$(CONFIG_MFD_CS5535)       += cs5535-mfd.o
> -obj-$(CONFIG_MFD_OMAP_USB_HOST)        += omap-usb-host.o
> +obj-$(CONFIG_MFD_OMAP_USB_HOST)        += omap-usb-host.o omap-usb-tll.o
>  obj-$(CONFIG_MFD_PM8921_CORE)  += pm8921-core.o
>  obj-$(CONFIG_MFD_PM8XXX_IRQ)   += pm8xxx-irq.o
>  obj-$(CONFIG_TPS65911_COMPARATOR)      += tps65911-comparator.o
> diff --git a/drivers/mfd/omap-usb-tll.c b/drivers/mfd/omap-usb-tll.c
> new file mode 100644
> index 0000000..3da468a
> --- /dev/null
> +++ b/drivers/mfd/omap-usb-tll.c
> @@ -0,0 +1,463 @@
> +/**
> + * omap-usb-tll.c - The USB TLL driver for OMAP EHCI & OHCI
> + *
> + * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com
> + * Author: Keshava Munegowda <keshava_mgowda@ti.com>
> + *
> + * This program is free software: you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2  of
> + * the License as published by the Free Software Foundation.
> + *
> + * 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, see <http://www.gnu.org/licenses/>.
> + */
> +#include <linux/kernel.h>
> +#include <linux/module.h>
> +#include <linux/types.h>
> +#include <linux/slab.h>
> +#include <linux/spinlock.h>
> +#include <linux/platform_device.h>
> +#include <linux/clk.h>
> +#include <linux/io.h>
> +#include <linux/err.h>
> +#include <plat/usb.h>
> +#include <linux/pm_runtime.h>
> +
> +#define USBTLL_DRIVER_NAME     "usbhs_tll"
> +
> +/* TLL Register Set */
> +#define        OMAP_USBTLL_REVISION                            (0x00)
> +#define        OMAP_USBTLL_SYSCONFIG                           (0x10)
> +#define        OMAP_USBTLL_SYSCONFIG_CACTIVITY                 (1 << 8)
> +#define        OMAP_USBTLL_SYSCONFIG_SIDLEMODE                 (1 << 3)
> +#define        OMAP_USBTLL_SYSCONFIG_ENAWAKEUP                 (1 << 2)
> +#define        OMAP_USBTLL_SYSCONFIG_SOFTRESET                 (1 << 1)
> +#define        OMAP_USBTLL_SYSCONFIG_AUTOIDLE                  (1 << 0)
> +
> +#define        OMAP_USBTLL_SYSSTATUS                           (0x14)
> +#define        OMAP_USBTLL_SYSSTATUS_RESETDONE                 (1 << 0)
> +
> +#define        OMAP_USBTLL_IRQSTATUS                           (0x18)
> +#define        OMAP_USBTLL_IRQENABLE                           (0x1C)
> +
> +#define        OMAP_TLL_SHARED_CONF                            (0x30)
> +#define        OMAP_TLL_SHARED_CONF_USB_90D_DDR_EN             (1 << 6)
> +#define        OMAP_TLL_SHARED_CONF_USB_180D_SDR_EN            (1 << 5)
> +#define        OMAP_TLL_SHARED_CONF_USB_DIVRATION              (1 << 2)
> +#define        OMAP_TLL_SHARED_CONF_FCLK_REQ                   (1 << 1)
> +#define        OMAP_TLL_SHARED_CONF_FCLK_IS_ON                 (1 << 0)
> +
> +#define        OMAP_TLL_CHANNEL_CONF(num)                      (0x040 + 0x004 * num)
> +#define OMAP_TLL_CHANNEL_CONF_FSLSMODE_SHIFT           24
> +#define        OMAP_TLL_CHANNEL_CONF_ULPINOBITSTUFF            (1 << 11)
> +#define        OMAP_TLL_CHANNEL_CONF_ULPI_ULPIAUTOIDLE         (1 << 10)
> +#define        OMAP_TLL_CHANNEL_CONF_UTMIAUTOIDLE              (1 << 9)
> +#define        OMAP_TLL_CHANNEL_CONF_ULPIDDRMODE               (1 << 8)
> +#define OMAP_TLL_CHANNEL_CONF_CHANMODE_FSLS            (1 << 1)
> +#define        OMAP_TLL_CHANNEL_CONF_CHANEN                    (1 << 0)
> +
> +#define OMAP_TLL_FSLSMODE_6PIN_PHY_DAT_SE0             0x0
> +#define OMAP_TLL_FSLSMODE_6PIN_PHY_DP_DM               0x1
> +#define OMAP_TLL_FSLSMODE_3PIN_PHY                     0x2
> +#define OMAP_TLL_FSLSMODE_4PIN_PHY                     0x3
> +#define OMAP_TLL_FSLSMODE_6PIN_TLL_DAT_SE0             0x4
> +#define OMAP_TLL_FSLSMODE_6PIN_TLL_DP_DM               0x5
> +#define OMAP_TLL_FSLSMODE_3PIN_TLL                     0x6
> +#define OMAP_TLL_FSLSMODE_4PIN_TLL                     0x7
> +#define OMAP_TLL_FSLSMODE_2PIN_TLL_DAT_SE0             0xA
> +#define OMAP_TLL_FSLSMODE_2PIN_DAT_DP_DM               0xB
> +
> +#define        OMAP_TLL_ULPI_FUNCTION_CTRL(num)                (0x804 + 0x100 * num)
> +#define        OMAP_TLL_ULPI_INTERFACE_CTRL(num)               (0x807 + 0x100 * num)
> +#define        OMAP_TLL_ULPI_OTG_CTRL(num)                     (0x80A + 0x100 * num)
> +#define        OMAP_TLL_ULPI_INT_EN_RISE(num)                  (0x80D + 0x100 * num)
> +#define        OMAP_TLL_ULPI_INT_EN_FALL(num)                  (0x810 + 0x100 * num)
> +#define        OMAP_TLL_ULPI_INT_STATUS(num)                   (0x813 + 0x100 * num)
> +#define        OMAP_TLL_ULPI_INT_LATCH(num)                    (0x814 + 0x100 * num)
> +#define        OMAP_TLL_ULPI_DEBUG(num)                        (0x815 + 0x100 * num)
> +#define        OMAP_TLL_ULPI_SCRATCH_REGISTER(num)             (0x816 + 0x100 * num)
> +
> +#define OMAP_REV2_TLL_CHANNEL_COUNT                    2
> +#define OMAP_TLL_CHANNEL_COUNT                         3
> +#define OMAP_TLL_CHANNEL_1_EN_MASK                     (1 << 0)
> +#define OMAP_TLL_CHANNEL_2_EN_MASK                     (1 << 1)
> +#define OMAP_TLL_CHANNEL_3_EN_MASK                     (1 << 2)
> +
> +/* Values of USBTLL_REVISION - Note: these are not given in the TRM */
> +#define OMAP_USBTLL_REV1               0x00000015      /* OMAP3 */
> +#define OMAP_USBTLL_REV2               0x00000004      /* OMAP4 */
> +
> +#define is_ehci_tll_mode(x)    (x == OMAP_EHCI_PORT_MODE_TLL)
> +
> +struct usbtll_omap {
> +       struct clk                              *usbtll_p1_fck;
> +       struct clk                              *usbtll_p2_fck;
> +       struct usbtll_omap_platform_data        platdata;
> +       spinlock_t                              lock;
> +};
> +
> +/*-------------------------------------------------------------------------*/
> +
> +const char usbtll_driver_name[] = USBTLL_DRIVER_NAME;
> +struct platform_device *tll_pdev;
> +
> +/*-------------------------------------------------------------------------*/
> +
> +static inline void usbtll_write(void __iomem *base, u32 reg, u32 val)
> +{
> +       __raw_writel(val, base + reg);
> +}
> +
> +static inline u32 usbtll_read(void __iomem *base, u32 reg)
> +{
> +       return __raw_readl(base + reg);
> +}
> +
> +static inline void usbtll_writeb(void __iomem *base, u8 reg, u8 val)
> +{
> +       __raw_writeb(val, base + reg);
> +}
> +
> +static inline u8 usbtll_readb(void __iomem *base, u8 reg)
> +{
> +       return __raw_readb(base + reg);
> +}
> +
> +/*-------------------------------------------------------------------------*/
> +
> +static bool is_ohci_port(enum usbhs_omap_port_mode pmode)
> +{
> +       switch (pmode) {
> +       case OMAP_OHCI_PORT_MODE_PHY_6PIN_DATSE0:
> +       case OMAP_OHCI_PORT_MODE_PHY_6PIN_DPDM:
> +       case OMAP_OHCI_PORT_MODE_PHY_3PIN_DATSE0:
> +       case OMAP_OHCI_PORT_MODE_PHY_4PIN_DPDM:
> +       case OMAP_OHCI_PORT_MODE_TLL_6PIN_DATSE0:
> +       case OMAP_OHCI_PORT_MODE_TLL_6PIN_DPDM:
> +       case OMAP_OHCI_PORT_MODE_TLL_3PIN_DATSE0:
> +       case OMAP_OHCI_PORT_MODE_TLL_4PIN_DPDM:
> +       case OMAP_OHCI_PORT_MODE_TLL_2PIN_DATSE0:
> +       case OMAP_OHCI_PORT_MODE_TLL_2PIN_DPDM:
> +               return true;
> +
> +       default:
> +               return false;
> +       }
> +}
> +
> +/*
> + * convert the port-mode enum to a value we can use in the FSLSMODE
> + * field of USBTLL_CHANNEL_CONF
> + */
> +static unsigned ohci_omap3_fslsmode(enum usbhs_omap_port_mode mode)
> +{
> +       switch (mode) {
> +       case OMAP_USBHS_PORT_MODE_UNUSED:
> +       case OMAP_OHCI_PORT_MODE_PHY_6PIN_DATSE0:
> +               return OMAP_TLL_FSLSMODE_6PIN_PHY_DAT_SE0;
> +
> +       case OMAP_OHCI_PORT_MODE_PHY_6PIN_DPDM:
> +               return OMAP_TLL_FSLSMODE_6PIN_PHY_DP_DM;
> +
> +       case OMAP_OHCI_PORT_MODE_PHY_3PIN_DATSE0:
> +               return OMAP_TLL_FSLSMODE_3PIN_PHY;
> +
> +       case OMAP_OHCI_PORT_MODE_PHY_4PIN_DPDM:
> +               return OMAP_TLL_FSLSMODE_4PIN_PHY;
> +
> +       case OMAP_OHCI_PORT_MODE_TLL_6PIN_DATSE0:
> +               return OMAP_TLL_FSLSMODE_6PIN_TLL_DAT_SE0;
> +
> +       case OMAP_OHCI_PORT_MODE_TLL_6PIN_DPDM:
> +               return OMAP_TLL_FSLSMODE_6PIN_TLL_DP_DM;
> +
> +       case OMAP_OHCI_PORT_MODE_TLL_3PIN_DATSE0:
> +               return OMAP_TLL_FSLSMODE_3PIN_TLL;
> +
> +       case OMAP_OHCI_PORT_MODE_TLL_4PIN_DPDM:
> +               return OMAP_TLL_FSLSMODE_4PIN_TLL;
> +
> +       case OMAP_OHCI_PORT_MODE_TLL_2PIN_DATSE0:
> +               return OMAP_TLL_FSLSMODE_2PIN_TLL_DAT_SE0;
> +
> +       case OMAP_OHCI_PORT_MODE_TLL_2PIN_DPDM:
> +               return OMAP_TLL_FSLSMODE_2PIN_DAT_DP_DM;
> +       default:
> +               pr_warning("Invalid port mode, using default\n");
> +               return OMAP_TLL_FSLSMODE_6PIN_PHY_DAT_SE0;
> +       }
> +}
> +
> +/**
> + * usbtll_omap_probe - initialize TI-based HCDs
> + *
> + * Allocates basic resources for this USB host controller.
> + */
> +static int __devinit usbtll_omap_probe(struct platform_device *pdev)
> +{
> +       struct device                           *dev =  &pdev->dev;
> +       struct usbtll_omap_platform_data        *pdata = dev->platform_data;
> +       void __iomem                            *base;
> +       struct resource                         *res;
> +       struct usbtll_omap                      *tll;
> +       unsigned                                reg;
> +       unsigned long                           flags;
> +       int                                     ret = 0;
> +       int                                     i, ver, count;
> +
> +       dev_dbg(dev, "starting TI HSUSB TLL Controller\n");
> +
> +       tll = kzalloc(sizeof(struct usbtll_omap), GFP_KERNEL);
> +       if (!tll) {
> +               dev_err(dev, "Memory allocation failed\n");
> +               ret = -ENOMEM;
> +               goto end;
> +       }
> +
> +       spin_lock_init(&tll->lock);
> +
> +       for (i = 0; i < OMAP3_HS_USB_PORTS; i++)
> +               tll->platdata.port_mode[i] = pdata->port_mode[i];
> +
> +       tll->usbtll_p1_fck = clk_get(dev, "usb_tll_hs_usb_ch0_clk");
> +       if (IS_ERR(tll->usbtll_p1_fck)) {
> +               ret = PTR_ERR(tll->usbtll_p1_fck);
> +               dev_err(dev, "usbtll_p1_fck failed error:%d\n", ret);
> +               goto err_tll;
> +       }
> +
> +       tll->usbtll_p2_fck = clk_get(dev, "usb_tll_hs_usb_ch1_clk");
> +       if (IS_ERR(tll->usbtll_p2_fck)) {
> +               ret = PTR_ERR(tll->usbtll_p2_fck);
> +               dev_err(dev, "usbtll_p2_fck failed error:%d\n", ret);
> +               goto err_usbtll_p1_fck;
> +       }
> +
> +       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> +       if (!res) {
> +               dev_err(dev, "usb tll get resource failed\n");
> +               ret = -ENODEV;
> +               goto err_usbtll_p2_fck;
> +       }
> +
> +       base = ioremap(res->start, resource_size(res));
> +       if (!base) {
> +               dev_err(dev, "TLL ioremap failed\n");
> +               ret = -ENOMEM;
> +               goto err_usbtll_p2_fck;
> +       }
> +
> +       platform_set_drvdata(pdev, tll);
> +       pm_runtime_enable(dev);
> +       pm_runtime_get_sync(dev);
> +
> +       spin_lock_irqsave(&tll->lock, flags);
> +
> +       ver =  usbtll_read(base, OMAP_USBTLL_REVISION);
> +       if (ver == OMAP_USBTLL_REV1)
> +               count = OMAP_TLL_CHANNEL_COUNT;
> +       else if (ver == OMAP_USBTLL_REV2)
> +               count = OMAP_REV2_TLL_CHANNEL_COUNT;
> +       else {
> +               dev_err(dev, "TLL version failed\n");
> +               ret = -ENODEV;
> +               goto err_ioremap;
> +       }
> +
> +       if (is_ehci_tll_mode(pdata->port_mode[0]) ||
> +               is_ehci_tll_mode(pdata->port_mode[1]) ||
> +               is_ehci_tll_mode(pdata->port_mode[2]) ||
> +               (is_ohci_port(pdata->port_mode[0])) ||
> +               (is_ohci_port(pdata->port_mode[1])) ||
> +               (is_ohci_port(pdata->port_mode[2]))) {
> +
> +               /* Program Common TLL register */
> +               reg = usbtll_read(base, OMAP_TLL_SHARED_CONF);
> +               reg |= (OMAP_TLL_SHARED_CONF_FCLK_IS_ON
> +                       | OMAP_TLL_SHARED_CONF_USB_DIVRATION);
> +               reg &= ~OMAP_TLL_SHARED_CONF_USB_90D_DDR_EN;
> +               reg &= ~OMAP_TLL_SHARED_CONF_USB_180D_SDR_EN;
> +
> +               usbtll_write(base, OMAP_TLL_SHARED_CONF, reg);
> +
> +               /* Enable channels now */
> +               for (i = 0; i < count; i++) {
> +                       reg = usbtll_read(base, OMAP_TLL_CHANNEL_CONF(i));
> +
> +                       if (is_ohci_port(pdata->port_mode[i])) {
> +                               reg |= ohci_omap3_fslsmode(pdata->port_mode[i])
> +                               << OMAP_TLL_CHANNEL_CONF_FSLSMODE_SHIFT;
> +                               reg |= OMAP_TLL_CHANNEL_CONF_CHANMODE_FSLS;
> +                       } else
> +                       if (pdata->port_mode[i] == OMAP_EHCI_PORT_MODE_TLL) {
> +
> +                               /*
> +                                * Disable AutoIdle, BitStuffing
> +                                * and use SDR Mode
> +                                */
> +                               reg &= ~(OMAP_TLL_CHANNEL_CONF_UTMIAUTOIDLE
> +                                       | OMAP_TLL_CHANNEL_CONF_ULPINOBITSTUFF
> +                                       | OMAP_TLL_CHANNEL_CONF_ULPIDDRMODE);
> +                       } else
> +                               continue;
> +
> +                       reg |= OMAP_TLL_CHANNEL_CONF_CHANEN;
> +                       usbtll_write(base, OMAP_TLL_CHANNEL_CONF(i), reg);
> +
> +                       usbtll_writeb(base,
> +                               OMAP_TLL_ULPI_SCRATCH_REGISTER(i), 0xbe);
> +               }
> +       }
> +
> +err_ioremap:
> +       spin_unlock_irqrestore(&tll->lock, flags);
> +       iounmap(base);
> +       pm_runtime_put_sync(dev);
> +       tll_pdev = pdev;
> +       if (!ret)
> +               goto end;
> +       pm_runtime_disable(dev);
> +
> +err_usbtll_p2_fck:
> +       clk_put(tll->usbtll_p2_fck);
> +
> +err_usbtll_p1_fck:
> +       clk_put(tll->usbtll_p1_fck);
> +
> +err_tll:
> +       kfree(tll);
> +
> +end:
> +       return ret;
> +}
> +
> +/**
> + * usbtll_omap_remove - shutdown processing for UHH & TLL HCDs
> + * @pdev: USB Host Controller being removed
> + *
> + * Reverses the effect of usbtll_omap_probe().
> + */
> +static int __devexit usbtll_omap_remove(struct platform_device *pdev)
> +{
> +       struct usbtll_omap *tll = platform_get_drvdata(pdev);
> +
> +       clk_put(tll->usbtll_p2_fck);
> +       clk_put(tll->usbtll_p1_fck);
> +       pm_runtime_disable(&pdev->dev);
> +       kfree(tll);
> +       return 0;
> +}
> +
> +static int usbtll_runtime_resume(struct device *dev)
> +{
> +       struct usbtll_omap                      *tll = dev_get_drvdata(dev);
> +       struct usbtll_omap_platform_data        *pdata = &tll->platdata;
> +       unsigned long                           flags;
> +
> +       dev_dbg(dev, "usbtll_runtime_resume\n");
> +
> +       if (!pdata) {
> +               dev_dbg(dev, "missing platform_data\n");
> +               return  -ENODEV;
> +       }
> +
> +       spin_lock_irqsave(&tll->lock, flags);
> +
> +       if (is_ehci_tll_mode(pdata->port_mode[0]))
> +               clk_enable(tll->usbtll_p1_fck);
> +
> +       if (is_ehci_tll_mode(pdata->port_mode[1]))
> +               clk_enable(tll->usbtll_p2_fck);
> +
> +       spin_unlock_irqrestore(&tll->lock, flags);
> +
> +       return 0;
> +}
> +
> +static int usbtll_runtime_suspend(struct device *dev)
> +{
> +       struct usbtll_omap                      *tll = dev_get_drvdata(dev);
> +       struct usbtll_omap_platform_data        *pdata = &tll->platdata;
> +       unsigned long                           flags;
> +
> +       dev_dbg(dev, "usbtll_runtime_suspend\n");
> +
> +       if (!pdata) {
> +               dev_dbg(dev, "missing platform_data\n");
> +               return  -ENODEV;
> +       }
> +
> +       spin_lock_irqsave(&tll->lock, flags);
> +
> +       if (is_ehci_tll_mode(pdata->port_mode[0]))
> +               clk_disable(tll->usbtll_p1_fck);
> +
> +       if (is_ehci_tll_mode(pdata->port_mode[1]))
> +               clk_disable(tll->usbtll_p2_fck);
> +
> +       spin_unlock_irqrestore(&tll->lock, flags);
> +
> +       return 0;
> +}
> +
> +static const struct dev_pm_ops usbtllomap_dev_pm_ops = {
> +       .runtime_suspend        = usbtll_runtime_suspend,
> +       .runtime_resume         = usbtll_runtime_resume,
> +};
> +
> +static struct platform_driver usbtll_omap_driver = {
> +       .driver = {
> +               .name           = (char *)usbtll_driver_name,
> +               .owner          = THIS_MODULE,
> +               .pm             = &usbtllomap_dev_pm_ops,
> +       },
> +       .remove         = __exit_p(usbtll_omap_remove),
> +};
> +
> +int omap_tll_enable(void)
> +{
> +       if (!tll_pdev) {
> +               dev_dbg(&tll_pdev->dev, "missing platform_data\n");
> +               return  -ENODEV;
> +       }
> +       return pm_runtime_get_sync(&tll_pdev->dev);
> +}
> +EXPORT_SYMBOL_GPL(omap_tll_enable);
> +
> +int omap_tll_disable(void)
> +{
> +       if (!tll_pdev) {
> +               dev_dbg(&tll_pdev->dev, "missing platform_data\n");
> +               return  -ENODEV;
> +       }
> +       return pm_runtime_put_sync(&tll_pdev->dev);
> +}
> +EXPORT_SYMBOL_GPL(omap_tll_disable);
> +
> +MODULE_AUTHOR("Keshava Munegowda <keshava_mgowda@ti.com>");
> +MODULE_ALIAS("platform:" USBHS_DRIVER_NAME);
> +MODULE_LICENSE("GPL v2");
> +MODULE_DESCRIPTION("usb tll driver for TI OMAP EHCI and OHCI controllers");
> +
> +static int __init omap_usbtll_drvinit(void)
> +{
> +       return platform_driver_probe(&usbtll_omap_driver, usbtll_omap_probe);
> +}
> +
> +/*
> + * init before usbhs core driver;
> + * The usbtll driver should be initialized before
> + * the usbhs core driver probe function is called.
> + */
> +fs_initcall(omap_usbtll_drvinit);

Hi Felipe

          do you have any comment here?
The TLL driver uses fs_initcall
and the UHH uses fs_initcall_sync

Intension of using this is , TLL driver should be initialized before UHH.


regards
keshava



> +
> +static void __exit omap_usbtll_drvexit(void)
> +{
> +       platform_driver_unregister(&usbtll_omap_driver);
> +}
> +module_exit(omap_usbtll_drvexit);
> --
> 1.6.0.4
>
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/5 RESEND] ARM: OMAP: USB: HOST TLL platform driver

[Shubhrajyoti]

Hi Keshava,

On Tuesday 20 March 2012 12:58 PM, Munegowda, Keshava wrote:<Snip>
>>> +}
>>> +
>>> +static const struct dev_pm_ops usbtllomap_dev_pm_ops = {
>>> +     .runtime_suspend        = usbtll_runtime_suspend,
>>> +     .runtime_resume         = usbtll_runtime_resume,
>>> +};
>>> +
>> Also how about using runtime_pm_ops ?
> Sorry I din't get this? what exact alternative are you suggesting here?

SET_RUNTIME_PM_OPS(usbtll_runtime_suspend,
                                usbtll_runtime_resume, NULL)

I should have been clearer.
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/5 RESEND] ARM: OMAP: USB: HOST TLL platform driver

[Munegowda, Keshava]

On Tue, Mar 20, 2012 at 2:22 PM, Shubhrajyoti <shubhrajyoti@ti.com> wrote:
> Hi Keshava,
>
> On Tuesday 20 March 2012 12:58 PM, Munegowda, Keshava wrote:<Snip>
>>>> +}
>>>> +
>>>> +static const struct dev_pm_ops usbtllomap_dev_pm_ops = {
>>>> +     .runtime_suspend        = usbtll_runtime_suspend,
>>>> +     .runtime_resume         = usbtll_runtime_resume,
>>>> +};
>>>> +
>>> Also how about using runtime_pm_ops ?
>> Sorry I din't get this? what exact alternative are you suggesting here?
>
> SET_RUNTIME_PM_OPS(usbtll_runtime_suspend,
>                                usbtll_runtime_resume, NULL)
>
> I should have been clearer.

Thanks, I will do this , I think Felipe has already pointed out this.

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

Re: [PATCH 1/5 RESEND] ARM: OMAP: USB: HOST TLL platform driver

[Munegowda, Keshava]

On Mon, Mar 19, 2012 at 3:36 PM, Felipe Balbi <balbi@ti.com> wrote:
> Hi,
>
> On Mon, Mar 19, 2012 at 12:18:31PM +0530, Keshava Munegowda wrote:
>> +     ver =  usbtll_read(base, OMAP_USBTLL_REVISION);
>> +     if (ver == OMAP_USBTLL_REV1)
>> +             count = OMAP_TLL_CHANNEL_COUNT;
>> +     else if (ver == OMAP_USBTLL_REV2)
>> +             count = OMAP_REV2_TLL_CHANNEL_COUNT;
>> +     else {
>> +             dev_err(dev, "TLL version failed\n");
>> +             ret = -ENODEV;
>> +             goto err_ioremap;
>> +     }
>
> wrong coding style.
>
>> +static const struct dev_pm_ops usbtllomap_dev_pm_ops = {
>> +     .runtime_suspend        = usbtll_runtime_suspend,
>> +     .runtime_resume         = usbtll_runtime_resume,
>
> use SET_RUNTIME_PM_OPS()
>
>> +static struct platform_driver usbtll_omap_driver = {
>> +     .driver = {
>> +             .name           = (char *)usbtll_driver_name,
>> +             .owner          = THIS_MODULE,
>> +             .pm             = &usbtllomap_dev_pm_ops,
>> +     },
>> +     .remove         = __exit_p(usbtll_omap_remove),
>
> __devexit_p()
>
>> +};
>> +
>> +int omap_tll_enable(void)
>> +{
>> +     if (!tll_pdev) {
>> +             dev_dbg(&tll_pdev->dev, "missing platform_data\n");
>> +             return  -ENODEV;
>> +     }
>> +     return pm_runtime_get_sync(&tll_pdev->dev);
>> +}
>> +EXPORT_SYMBOL_GPL(omap_tll_enable);
>
> why ?

the usb hs core driver uses omap_tll_enable and omap_tll_disable
apis based on the port selection in ./drivers/mfd/omap-usb-host.c file.


>> +
>> +int omap_tll_disable(void)
>> +{
>> +     if (!tll_pdev) {
>> +             dev_dbg(&tll_pdev->dev, "missing platform_data\n");
>> +             return  -ENODEV;
>> +     }
>> +     return pm_runtime_put_sync(&tll_pdev->dev);
>> +}
>> +EXPORT_SYMBOL_GPL(omap_tll_disable);
>
> why ?
>
>> +MODULE_AUTHOR("Keshava Munegowda <keshava_mgowda@ti.com>");
>> +MODULE_ALIAS("platform:" USBHS_DRIVER_NAME);
>> +MODULE_LICENSE("GPL v2");
>> +MODULE_DESCRIPTION("usb tll driver for TI OMAP EHCI and OHCI controllers");
>> +
>> +static int __init omap_usbtll_drvinit(void)
>> +{
>> +     return platform_driver_probe(&usbtll_omap_driver, usbtll_omap_probe);
>
> please don't. Make sure you use platform_driver_register, instead.


Here , omap_usbtll_drvinit is registered through fs_initcall call;
this is required because, the TLL driver is required to initialized
before the UHH ( usb host core) driver.

regards
keshava



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

Re: [PATCH 1/5 RESEND] ARM: OMAP: USB: HOST TLL platform driver

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 846 bytes --]

Hi,

On Tue, Mar 20, 2012 at 03:00:50PM +0530, Munegowda, Keshava wrote:
> >> +MODULE_AUTHOR("Keshava Munegowda <keshava_mgowda-l0cyMroinI0@public.gmane.org>");
> >> +MODULE_ALIAS("platform:" USBHS_DRIVER_NAME);
> >> +MODULE_LICENSE("GPL v2");
> >> +MODULE_DESCRIPTION("usb tll driver for TI OMAP EHCI and OHCI controllers");
> >> +
> >> +static int __init omap_usbtll_drvinit(void)
> >> +{
> >> +     return platform_driver_probe(&usbtll_omap_driver, usbtll_omap_probe);
> >
> > please don't. Make sure you use platform_driver_register, instead.
> 
> 
> Here , omap_usbtll_drvinit is registered through fs_initcall call;
> this is required because, the TLL driver is required to initialized
> before the UHH ( usb host core) driver.

no issues with fs_initcall. The issue is with platform_driver_probe()
only.

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH 1/5 RESEND] ARM: OMAP: USB: HOST TLL platform driver

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 23313 bytes --]

On Tue, Mar 20, 2012 at 01:02:58PM +0530, Munegowda, Keshava wrote:
> On Mon, Mar 19, 2012 at 12:18 PM, Keshava Munegowda
> <keshava_mgowda@ti.com> wrote:
> > From: Keshava Munegowda <Keshava_mgowda@ti.com>
> >
> > The platform driver for the TLL component of the OMAP USB host controller
> > is implemented. Depending on the TLL hardware revision , the TLL channels
> > are configured. The USB HS core driver uses this driver through exported
> > APIs from the TLL platform driver.
> > usb_tll_enable and usb_tll_disble are the exported APIs of the USB TLL
> > platform driver.
> >
> > Signed-off-by: Keshava Munegowda <keshava_mgowda@ti.com>
> > Reviewed-by: Partha Basak <parthab@india.ti.com>
> > ---
> >  arch/arm/plat-omap/include/plat/usb.h |    8 +
> >  drivers/mfd/Kconfig                   |    2 +-
> >  drivers/mfd/Makefile                  |    2 +-
> >  drivers/mfd/omap-usb-tll.c            |  463 +++++++++++++++++++++++++++++++++
> >  4 files changed, 473 insertions(+), 2 deletions(-)
> >  create mode 100644 drivers/mfd/omap-usb-tll.c
> >
> > diff --git a/arch/arm/plat-omap/include/plat/usb.h b/arch/arm/plat-omap/include/plat/usb.h
> > index dc864b5..eb1e47d 100644
> > --- a/arch/arm/plat-omap/include/plat/usb.h
> > +++ b/arch/arm/plat-omap/include/plat/usb.h
> > @@ -61,6 +61,10 @@ struct usbhs_omap_platform_data {
> >        struct ehci_hcd_omap_platform_data      *ehci_data;
> >        struct ohci_hcd_omap_platform_data      *ohci_data;
> >  };
> > +
> > +struct usbtll_omap_platform_data {
> > +       enum usbhs_omap_port_mode               port_mode[OMAP3_HS_USB_PORTS];
> > +};
> >  /*-------------------------------------------------------------------------*/
> >
> >  #define OMAP1_OTG_BASE                 0xfffb0400
> > @@ -105,6 +109,10 @@ extern int omap4430_phy_set_clk(struct device *dev, int on);
> >  extern int omap4430_phy_init(struct device *dev);
> >  extern int omap4430_phy_exit(struct device *dev);
> >  extern int omap4430_phy_suspend(struct device *dev, int suspend);
> > +
> > +extern int omap_tll_enable(void);
> > +extern int omap_tll_disable(void);
> > +
> >  #endif
> >
> >  extern void am35x_musb_reset(void);
> > diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
> > index f147395..5f75ad4 100644
> > --- a/drivers/mfd/Kconfig
> > +++ b/drivers/mfd/Kconfig
> > @@ -772,7 +772,7 @@ config MFD_WL1273_CORE
> >          audio codec.
> >
> >  config MFD_OMAP_USB_HOST
> > -       bool "Support OMAP USBHS core driver"
> > +       bool "Support OMAP USBHS core and TLL driver"
> >        depends on USB_EHCI_HCD_OMAP || USB_OHCI_HCD_OMAP3
> >        default y
> >        help
> > diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
> > index b953bab..4b3a8e0 100644
> > --- a/drivers/mfd/Makefile
> > +++ b/drivers/mfd/Makefile
> > @@ -105,7 +105,7 @@ obj-$(CONFIG_MFD_TPS6586X)  += tps6586x.o
> >  obj-$(CONFIG_MFD_VX855)                += vx855.o
> >  obj-$(CONFIG_MFD_WL1273_CORE)  += wl1273-core.o
> >  obj-$(CONFIG_MFD_CS5535)       += cs5535-mfd.o
> > -obj-$(CONFIG_MFD_OMAP_USB_HOST)        += omap-usb-host.o
> > +obj-$(CONFIG_MFD_OMAP_USB_HOST)        += omap-usb-host.o omap-usb-tll.o
> >  obj-$(CONFIG_MFD_PM8921_CORE)  += pm8921-core.o
> >  obj-$(CONFIG_MFD_PM8XXX_IRQ)   += pm8xxx-irq.o
> >  obj-$(CONFIG_TPS65911_COMPARATOR)      += tps65911-comparator.o
> > diff --git a/drivers/mfd/omap-usb-tll.c b/drivers/mfd/omap-usb-tll.c
> > new file mode 100644
> > index 0000000..3da468a
> > --- /dev/null
> > +++ b/drivers/mfd/omap-usb-tll.c
> > @@ -0,0 +1,463 @@
> > +/**
> > + * omap-usb-tll.c - The USB TLL driver for OMAP EHCI & OHCI
> > + *
> > + * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com
> > + * Author: Keshava Munegowda <keshava_mgowda@ti.com>
> > + *
> > + * This program is free software: you can redistribute it and/or modify
> > + * it under the terms of the GNU General Public License version 2  of
> > + * the License as published by the Free Software Foundation.
> > + *
> > + * 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, see <http://www.gnu.org/licenses/>.
> > + */
> > +#include <linux/kernel.h>
> > +#include <linux/module.h>
> > +#include <linux/types.h>
> > +#include <linux/slab.h>
> > +#include <linux/spinlock.h>
> > +#include <linux/platform_device.h>
> > +#include <linux/clk.h>
> > +#include <linux/io.h>
> > +#include <linux/err.h>
> > +#include <plat/usb.h>
> > +#include <linux/pm_runtime.h>
> > +
> > +#define USBTLL_DRIVER_NAME     "usbhs_tll"
> > +
> > +/* TLL Register Set */
> > +#define        OMAP_USBTLL_REVISION                            (0x00)
> > +#define        OMAP_USBTLL_SYSCONFIG                           (0x10)
> > +#define        OMAP_USBTLL_SYSCONFIG_CACTIVITY                 (1 << 8)
> > +#define        OMAP_USBTLL_SYSCONFIG_SIDLEMODE                 (1 << 3)
> > +#define        OMAP_USBTLL_SYSCONFIG_ENAWAKEUP                 (1 << 2)
> > +#define        OMAP_USBTLL_SYSCONFIG_SOFTRESET                 (1 << 1)
> > +#define        OMAP_USBTLL_SYSCONFIG_AUTOIDLE                  (1 << 0)
> > +
> > +#define        OMAP_USBTLL_SYSSTATUS                           (0x14)
> > +#define        OMAP_USBTLL_SYSSTATUS_RESETDONE                 (1 << 0)
> > +
> > +#define        OMAP_USBTLL_IRQSTATUS                           (0x18)
> > +#define        OMAP_USBTLL_IRQENABLE                           (0x1C)
> > +
> > +#define        OMAP_TLL_SHARED_CONF                            (0x30)
> > +#define        OMAP_TLL_SHARED_CONF_USB_90D_DDR_EN             (1 << 6)
> > +#define        OMAP_TLL_SHARED_CONF_USB_180D_SDR_EN            (1 << 5)
> > +#define        OMAP_TLL_SHARED_CONF_USB_DIVRATION              (1 << 2)
> > +#define        OMAP_TLL_SHARED_CONF_FCLK_REQ                   (1 << 1)
> > +#define        OMAP_TLL_SHARED_CONF_FCLK_IS_ON                 (1 << 0)
> > +
> > +#define        OMAP_TLL_CHANNEL_CONF(num)                      (0x040 + 0x004 * num)
> > +#define OMAP_TLL_CHANNEL_CONF_FSLSMODE_SHIFT           24
> > +#define        OMAP_TLL_CHANNEL_CONF_ULPINOBITSTUFF            (1 << 11)
> > +#define        OMAP_TLL_CHANNEL_CONF_ULPI_ULPIAUTOIDLE         (1 << 10)
> > +#define        OMAP_TLL_CHANNEL_CONF_UTMIAUTOIDLE              (1 << 9)
> > +#define        OMAP_TLL_CHANNEL_CONF_ULPIDDRMODE               (1 << 8)
> > +#define OMAP_TLL_CHANNEL_CONF_CHANMODE_FSLS            (1 << 1)
> > +#define        OMAP_TLL_CHANNEL_CONF_CHANEN                    (1 << 0)
> > +
> > +#define OMAP_TLL_FSLSMODE_6PIN_PHY_DAT_SE0             0x0
> > +#define OMAP_TLL_FSLSMODE_6PIN_PHY_DP_DM               0x1
> > +#define OMAP_TLL_FSLSMODE_3PIN_PHY                     0x2
> > +#define OMAP_TLL_FSLSMODE_4PIN_PHY                     0x3
> > +#define OMAP_TLL_FSLSMODE_6PIN_TLL_DAT_SE0             0x4
> > +#define OMAP_TLL_FSLSMODE_6PIN_TLL_DP_DM               0x5
> > +#define OMAP_TLL_FSLSMODE_3PIN_TLL                     0x6
> > +#define OMAP_TLL_FSLSMODE_4PIN_TLL                     0x7
> > +#define OMAP_TLL_FSLSMODE_2PIN_TLL_DAT_SE0             0xA
> > +#define OMAP_TLL_FSLSMODE_2PIN_DAT_DP_DM               0xB
> > +
> > +#define        OMAP_TLL_ULPI_FUNCTION_CTRL(num)                (0x804 + 0x100 * num)
> > +#define        OMAP_TLL_ULPI_INTERFACE_CTRL(num)               (0x807 + 0x100 * num)
> > +#define        OMAP_TLL_ULPI_OTG_CTRL(num)                     (0x80A + 0x100 * num)
> > +#define        OMAP_TLL_ULPI_INT_EN_RISE(num)                  (0x80D + 0x100 * num)
> > +#define        OMAP_TLL_ULPI_INT_EN_FALL(num)                  (0x810 + 0x100 * num)
> > +#define        OMAP_TLL_ULPI_INT_STATUS(num)                   (0x813 + 0x100 * num)
> > +#define        OMAP_TLL_ULPI_INT_LATCH(num)                    (0x814 + 0x100 * num)
> > +#define        OMAP_TLL_ULPI_DEBUG(num)                        (0x815 + 0x100 * num)
> > +#define        OMAP_TLL_ULPI_SCRATCH_REGISTER(num)             (0x816 + 0x100 * num)
> > +
> > +#define OMAP_REV2_TLL_CHANNEL_COUNT                    2
> > +#define OMAP_TLL_CHANNEL_COUNT                         3
> > +#define OMAP_TLL_CHANNEL_1_EN_MASK                     (1 << 0)
> > +#define OMAP_TLL_CHANNEL_2_EN_MASK                     (1 << 1)
> > +#define OMAP_TLL_CHANNEL_3_EN_MASK                     (1 << 2)
> > +
> > +/* Values of USBTLL_REVISION - Note: these are not given in the TRM */
> > +#define OMAP_USBTLL_REV1               0x00000015      /* OMAP3 */
> > +#define OMAP_USBTLL_REV2               0x00000004      /* OMAP4 */
> > +
> > +#define is_ehci_tll_mode(x)    (x == OMAP_EHCI_PORT_MODE_TLL)
> > +
> > +struct usbtll_omap {
> > +       struct clk                              *usbtll_p1_fck;
> > +       struct clk                              *usbtll_p2_fck;
> > +       struct usbtll_omap_platform_data        platdata;
> > +       spinlock_t                              lock;
> > +};
> > +
> > +/*-------------------------------------------------------------------------*/
> > +
> > +const char usbtll_driver_name[] = USBTLL_DRIVER_NAME;
> > +struct platform_device *tll_pdev;
> > +
> > +/*-------------------------------------------------------------------------*/
> > +
> > +static inline void usbtll_write(void __iomem *base, u32 reg, u32 val)
> > +{
> > +       __raw_writel(val, base + reg);
> > +}
> > +
> > +static inline u32 usbtll_read(void __iomem *base, u32 reg)
> > +{
> > +       return __raw_readl(base + reg);
> > +}
> > +
> > +static inline void usbtll_writeb(void __iomem *base, u8 reg, u8 val)
> > +{
> > +       __raw_writeb(val, base + reg);
> > +}
> > +
> > +static inline u8 usbtll_readb(void __iomem *base, u8 reg)
> > +{
> > +       return __raw_readb(base + reg);
> > +}
> > +
> > +/*-------------------------------------------------------------------------*/
> > +
> > +static bool is_ohci_port(enum usbhs_omap_port_mode pmode)
> > +{
> > +       switch (pmode) {
> > +       case OMAP_OHCI_PORT_MODE_PHY_6PIN_DATSE0:
> > +       case OMAP_OHCI_PORT_MODE_PHY_6PIN_DPDM:
> > +       case OMAP_OHCI_PORT_MODE_PHY_3PIN_DATSE0:
> > +       case OMAP_OHCI_PORT_MODE_PHY_4PIN_DPDM:
> > +       case OMAP_OHCI_PORT_MODE_TLL_6PIN_DATSE0:
> > +       case OMAP_OHCI_PORT_MODE_TLL_6PIN_DPDM:
> > +       case OMAP_OHCI_PORT_MODE_TLL_3PIN_DATSE0:
> > +       case OMAP_OHCI_PORT_MODE_TLL_4PIN_DPDM:
> > +       case OMAP_OHCI_PORT_MODE_TLL_2PIN_DATSE0:
> > +       case OMAP_OHCI_PORT_MODE_TLL_2PIN_DPDM:
> > +               return true;
> > +
> > +       default:
> > +               return false;
> > +       }
> > +}
> > +
> > +/*
> > + * convert the port-mode enum to a value we can use in the FSLSMODE
> > + * field of USBTLL_CHANNEL_CONF
> > + */
> > +static unsigned ohci_omap3_fslsmode(enum usbhs_omap_port_mode mode)
> > +{
> > +       switch (mode) {
> > +       case OMAP_USBHS_PORT_MODE_UNUSED:
> > +       case OMAP_OHCI_PORT_MODE_PHY_6PIN_DATSE0:
> > +               return OMAP_TLL_FSLSMODE_6PIN_PHY_DAT_SE0;
> > +
> > +       case OMAP_OHCI_PORT_MODE_PHY_6PIN_DPDM:
> > +               return OMAP_TLL_FSLSMODE_6PIN_PHY_DP_DM;
> > +
> > +       case OMAP_OHCI_PORT_MODE_PHY_3PIN_DATSE0:
> > +               return OMAP_TLL_FSLSMODE_3PIN_PHY;
> > +
> > +       case OMAP_OHCI_PORT_MODE_PHY_4PIN_DPDM:
> > +               return OMAP_TLL_FSLSMODE_4PIN_PHY;
> > +
> > +       case OMAP_OHCI_PORT_MODE_TLL_6PIN_DATSE0:
> > +               return OMAP_TLL_FSLSMODE_6PIN_TLL_DAT_SE0;
> > +
> > +       case OMAP_OHCI_PORT_MODE_TLL_6PIN_DPDM:
> > +               return OMAP_TLL_FSLSMODE_6PIN_TLL_DP_DM;
> > +
> > +       case OMAP_OHCI_PORT_MODE_TLL_3PIN_DATSE0:
> > +               return OMAP_TLL_FSLSMODE_3PIN_TLL;
> > +
> > +       case OMAP_OHCI_PORT_MODE_TLL_4PIN_DPDM:
> > +               return OMAP_TLL_FSLSMODE_4PIN_TLL;
> > +
> > +       case OMAP_OHCI_PORT_MODE_TLL_2PIN_DATSE0:
> > +               return OMAP_TLL_FSLSMODE_2PIN_TLL_DAT_SE0;
> > +
> > +       case OMAP_OHCI_PORT_MODE_TLL_2PIN_DPDM:
> > +               return OMAP_TLL_FSLSMODE_2PIN_DAT_DP_DM;
> > +       default:
> > +               pr_warning("Invalid port mode, using default\n");
> > +               return OMAP_TLL_FSLSMODE_6PIN_PHY_DAT_SE0;
> > +       }
> > +}
> > +
> > +/**
> > + * usbtll_omap_probe - initialize TI-based HCDs
> > + *
> > + * Allocates basic resources for this USB host controller.
> > + */
> > +static int __devinit usbtll_omap_probe(struct platform_device *pdev)
> > +{
> > +       struct device                           *dev =  &pdev->dev;
> > +       struct usbtll_omap_platform_data        *pdata = dev->platform_data;
> > +       void __iomem                            *base;
> > +       struct resource                         *res;
> > +       struct usbtll_omap                      *tll;
> > +       unsigned                                reg;
> > +       unsigned long                           flags;
> > +       int                                     ret = 0;
> > +       int                                     i, ver, count;
> > +
> > +       dev_dbg(dev, "starting TI HSUSB TLL Controller\n");
> > +
> > +       tll = kzalloc(sizeof(struct usbtll_omap), GFP_KERNEL);
> > +       if (!tll) {
> > +               dev_err(dev, "Memory allocation failed\n");
> > +               ret = -ENOMEM;
> > +               goto end;
> > +       }
> > +
> > +       spin_lock_init(&tll->lock);
> > +
> > +       for (i = 0; i < OMAP3_HS_USB_PORTS; i++)
> > +               tll->platdata.port_mode[i] = pdata->port_mode[i];
> > +
> > +       tll->usbtll_p1_fck = clk_get(dev, "usb_tll_hs_usb_ch0_clk");
> > +       if (IS_ERR(tll->usbtll_p1_fck)) {
> > +               ret = PTR_ERR(tll->usbtll_p1_fck);
> > +               dev_err(dev, "usbtll_p1_fck failed error:%d\n", ret);
> > +               goto err_tll;
> > +       }
> > +
> > +       tll->usbtll_p2_fck = clk_get(dev, "usb_tll_hs_usb_ch1_clk");
> > +       if (IS_ERR(tll->usbtll_p2_fck)) {
> > +               ret = PTR_ERR(tll->usbtll_p2_fck);
> > +               dev_err(dev, "usbtll_p2_fck failed error:%d\n", ret);
> > +               goto err_usbtll_p1_fck;
> > +       }
> > +
> > +       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> > +       if (!res) {
> > +               dev_err(dev, "usb tll get resource failed\n");
> > +               ret = -ENODEV;
> > +               goto err_usbtll_p2_fck;
> > +       }
> > +
> > +       base = ioremap(res->start, resource_size(res));
> > +       if (!base) {
> > +               dev_err(dev, "TLL ioremap failed\n");
> > +               ret = -ENOMEM;
> > +               goto err_usbtll_p2_fck;
> > +       }
> > +
> > +       platform_set_drvdata(pdev, tll);
> > +       pm_runtime_enable(dev);
> > +       pm_runtime_get_sync(dev);
> > +
> > +       spin_lock_irqsave(&tll->lock, flags);
> > +
> > +       ver =  usbtll_read(base, OMAP_USBTLL_REVISION);
> > +       if (ver == OMAP_USBTLL_REV1)
> > +               count = OMAP_TLL_CHANNEL_COUNT;
> > +       else if (ver == OMAP_USBTLL_REV2)
> > +               count = OMAP_REV2_TLL_CHANNEL_COUNT;
> > +       else {
> > +               dev_err(dev, "TLL version failed\n");
> > +               ret = -ENODEV;
> > +               goto err_ioremap;
> > +       }
> > +
> > +       if (is_ehci_tll_mode(pdata->port_mode[0]) ||
> > +               is_ehci_tll_mode(pdata->port_mode[1]) ||
> > +               is_ehci_tll_mode(pdata->port_mode[2]) ||
> > +               (is_ohci_port(pdata->port_mode[0])) ||
> > +               (is_ohci_port(pdata->port_mode[1])) ||
> > +               (is_ohci_port(pdata->port_mode[2]))) {
> > +
> > +               /* Program Common TLL register */
> > +               reg = usbtll_read(base, OMAP_TLL_SHARED_CONF);
> > +               reg |= (OMAP_TLL_SHARED_CONF_FCLK_IS_ON
> > +                       | OMAP_TLL_SHARED_CONF_USB_DIVRATION);
> > +               reg &= ~OMAP_TLL_SHARED_CONF_USB_90D_DDR_EN;
> > +               reg &= ~OMAP_TLL_SHARED_CONF_USB_180D_SDR_EN;
> > +
> > +               usbtll_write(base, OMAP_TLL_SHARED_CONF, reg);
> > +
> > +               /* Enable channels now */
> > +               for (i = 0; i < count; i++) {
> > +                       reg = usbtll_read(base, OMAP_TLL_CHANNEL_CONF(i));
> > +
> > +                       if (is_ohci_port(pdata->port_mode[i])) {
> > +                               reg |= ohci_omap3_fslsmode(pdata->port_mode[i])
> > +                               << OMAP_TLL_CHANNEL_CONF_FSLSMODE_SHIFT;
> > +                               reg |= OMAP_TLL_CHANNEL_CONF_CHANMODE_FSLS;
> > +                       } else
> > +                       if (pdata->port_mode[i] == OMAP_EHCI_PORT_MODE_TLL) {
> > +
> > +                               /*
> > +                                * Disable AutoIdle, BitStuffing
> > +                                * and use SDR Mode
> > +                                */
> > +                               reg &= ~(OMAP_TLL_CHANNEL_CONF_UTMIAUTOIDLE
> > +                                       | OMAP_TLL_CHANNEL_CONF_ULPINOBITSTUFF
> > +                                       | OMAP_TLL_CHANNEL_CONF_ULPIDDRMODE);
> > +                       } else
> > +                               continue;
> > +
> > +                       reg |= OMAP_TLL_CHANNEL_CONF_CHANEN;
> > +                       usbtll_write(base, OMAP_TLL_CHANNEL_CONF(i), reg);
> > +
> > +                       usbtll_writeb(base,
> > +                               OMAP_TLL_ULPI_SCRATCH_REGISTER(i), 0xbe);
> > +               }
> > +       }
> > +
> > +err_ioremap:
> > +       spin_unlock_irqrestore(&tll->lock, flags);
> > +       iounmap(base);
> > +       pm_runtime_put_sync(dev);
> > +       tll_pdev = pdev;
> > +       if (!ret)
> > +               goto end;
> > +       pm_runtime_disable(dev);
> > +
> > +err_usbtll_p2_fck:
> > +       clk_put(tll->usbtll_p2_fck);
> > +
> > +err_usbtll_p1_fck:
> > +       clk_put(tll->usbtll_p1_fck);
> > +
> > +err_tll:
> > +       kfree(tll);
> > +
> > +end:
> > +       return ret;
> > +}
> > +
> > +/**
> > + * usbtll_omap_remove - shutdown processing for UHH & TLL HCDs
> > + * @pdev: USB Host Controller being removed
> > + *
> > + * Reverses the effect of usbtll_omap_probe().
> > + */
> > +static int __devexit usbtll_omap_remove(struct platform_device *pdev)
> > +{
> > +       struct usbtll_omap *tll = platform_get_drvdata(pdev);
> > +
> > +       clk_put(tll->usbtll_p2_fck);
> > +       clk_put(tll->usbtll_p1_fck);
> > +       pm_runtime_disable(&pdev->dev);
> > +       kfree(tll);
> > +       return 0;
> > +}
> > +
> > +static int usbtll_runtime_resume(struct device *dev)
> > +{
> > +       struct usbtll_omap                      *tll = dev_get_drvdata(dev);
> > +       struct usbtll_omap_platform_data        *pdata = &tll->platdata;
> > +       unsigned long                           flags;
> > +
> > +       dev_dbg(dev, "usbtll_runtime_resume\n");
> > +
> > +       if (!pdata) {
> > +               dev_dbg(dev, "missing platform_data\n");
> > +               return  -ENODEV;
> > +       }
> > +
> > +       spin_lock_irqsave(&tll->lock, flags);
> > +
> > +       if (is_ehci_tll_mode(pdata->port_mode[0]))
> > +               clk_enable(tll->usbtll_p1_fck);
> > +
> > +       if (is_ehci_tll_mode(pdata->port_mode[1]))
> > +               clk_enable(tll->usbtll_p2_fck);
> > +
> > +       spin_unlock_irqrestore(&tll->lock, flags);
> > +
> > +       return 0;
> > +}
> > +
> > +static int usbtll_runtime_suspend(struct device *dev)
> > +{
> > +       struct usbtll_omap                      *tll = dev_get_drvdata(dev);
> > +       struct usbtll_omap_platform_data        *pdata = &tll->platdata;
> > +       unsigned long                           flags;
> > +
> > +       dev_dbg(dev, "usbtll_runtime_suspend\n");
> > +
> > +       if (!pdata) {
> > +               dev_dbg(dev, "missing platform_data\n");
> > +               return  -ENODEV;
> > +       }
> > +
> > +       spin_lock_irqsave(&tll->lock, flags);
> > +
> > +       if (is_ehci_tll_mode(pdata->port_mode[0]))
> > +               clk_disable(tll->usbtll_p1_fck);
> > +
> > +       if (is_ehci_tll_mode(pdata->port_mode[1]))
> > +               clk_disable(tll->usbtll_p2_fck);
> > +
> > +       spin_unlock_irqrestore(&tll->lock, flags);
> > +
> > +       return 0;
> > +}
> > +
> > +static const struct dev_pm_ops usbtllomap_dev_pm_ops = {
> > +       .runtime_suspend        = usbtll_runtime_suspend,
> > +       .runtime_resume         = usbtll_runtime_resume,
> > +};
> > +
> > +static struct platform_driver usbtll_omap_driver = {
> > +       .driver = {
> > +               .name           = (char *)usbtll_driver_name,
> > +               .owner          = THIS_MODULE,
> > +               .pm             = &usbtllomap_dev_pm_ops,
> > +       },
> > +       .remove         = __exit_p(usbtll_omap_remove),
> > +};
> > +
> > +int omap_tll_enable(void)
> > +{
> > +       if (!tll_pdev) {
> > +               dev_dbg(&tll_pdev->dev, "missing platform_data\n");
> > +               return  -ENODEV;
> > +       }
> > +       return pm_runtime_get_sync(&tll_pdev->dev);
> > +}
> > +EXPORT_SYMBOL_GPL(omap_tll_enable);
> > +
> > +int omap_tll_disable(void)
> > +{
> > +       if (!tll_pdev) {
> > +               dev_dbg(&tll_pdev->dev, "missing platform_data\n");
> > +               return  -ENODEV;
> > +       }
> > +       return pm_runtime_put_sync(&tll_pdev->dev);
> > +}
> > +EXPORT_SYMBOL_GPL(omap_tll_disable);
> > +
> > +MODULE_AUTHOR("Keshava Munegowda <keshava_mgowda@ti.com>");
> > +MODULE_ALIAS("platform:" USBHS_DRIVER_NAME);
> > +MODULE_LICENSE("GPL v2");
> > +MODULE_DESCRIPTION("usb tll driver for TI OMAP EHCI and OHCI controllers");
> > +
> > +static int __init omap_usbtll_drvinit(void)
> > +{
> > +       return platform_driver_probe(&usbtll_omap_driver, usbtll_omap_probe);
> > +}
> > +
> > +/*
> > + * init before usbhs core driver;
> > + * The usbtll driver should be initialized before
> > + * the usbhs core driver probe function is called.
> > + */
> > +fs_initcall(omap_usbtll_drvinit);
> 
> Hi Felipe
> 
>           do you have any comment here?
> The TLL driver uses fs_initcall
> and the UHH uses fs_initcall_sync
> 
> Intension of using this is , TLL driver should be initialized before
> UHH.

At a first look, I don't think this trickery is necessary because UHH
uses exported symbol from TLL and modules.dep will solve that
dependency, but I'm not sure how that'll play with built-in modules, so
keep it as is (unless someone can clarify that part heh).

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH 1/5 RESEND] ARM: OMAP: USB: HOST TLL platform driver

[Munegowda, Keshava]

On Tue, Mar 20, 2012 at 3:29 PM, Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org> wrote:
> Hi,
>
> On Tue, Mar 20, 2012 at 03:00:50PM +0530, Munegowda, Keshava wrote:
>> >> +MODULE_AUTHOR("Keshava Munegowda <keshava_mgowda-l0cyMroinI0@public.gmane.org>");
>> >> +MODULE_ALIAS("platform:" USBHS_DRIVER_NAME);
>> >> +MODULE_LICENSE("GPL v2");
>> >> +MODULE_DESCRIPTION("usb tll driver for TI OMAP EHCI and OHCI controllers");
>> >> +
>> >> +static int __init omap_usbtll_drvinit(void)
>> >> +{
>> >> +     return platform_driver_probe(&usbtll_omap_driver, usbtll_omap_probe);
>> >
>> > please don't. Make sure you use platform_driver_register, instead.
>>
>>
>> Here , omap_usbtll_drvinit is registered through fs_initcall call;
>> this is required because, the TLL driver is required to initialized
>> before the UHH ( usb host core) driver.
>
> no issues with fs_initcall. The issue is with platform_driver_probe()
> only.
>
> --
> balbi

Thanks , I got it.
I will take the same comment make the same change in usbhs driver too;

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

Re: [PATCH 1/5 RESEND] ARM: OMAP: USB: HOST TLL platform driver

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 1169 bytes --]

On Tue, Mar 20, 2012 at 04:21:18PM +0530, Munegowda, Keshava wrote:
> On Tue, Mar 20, 2012 at 3:29 PM, Felipe Balbi <balbi@ti.com> wrote:
> > Hi,
> >
> > On Tue, Mar 20, 2012 at 03:00:50PM +0530, Munegowda, Keshava wrote:
> >> >> +MODULE_AUTHOR("Keshava Munegowda <keshava_mgowda@ti.com>");
> >> >> +MODULE_ALIAS("platform:" USBHS_DRIVER_NAME);
> >> >> +MODULE_LICENSE("GPL v2");
> >> >> +MODULE_DESCRIPTION("usb tll driver for TI OMAP EHCI and OHCI controllers");
> >> >> +
> >> >> +static int __init omap_usbtll_drvinit(void)
> >> >> +{
> >> >> +     return platform_driver_probe(&usbtll_omap_driver, usbtll_omap_probe);
> >> >
> >> > please don't. Make sure you use platform_driver_register, instead.
> >>
> >>
> >> Here , omap_usbtll_drvinit is registered through fs_initcall call;
> >> this is required because, the TLL driver is required to initialized
> >> before the UHH ( usb host core) driver.
> >
> > no issues with fs_initcall. The issue is with platform_driver_probe()
> > only.
> >
> > --
> > balbi
> 
> Thanks , I got it.
> I will take the same comment make the same change in usbhs driver too;

cool, thanks

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]