linux-omap.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/3 v5] AM35x: Add musb support
@ 2010-09-30  5:19 Ajay Kumar Gupta
  2010-09-30  5:19 ` [PATCH 2/3 v5] musb: add musb support for AM35x Ajay Kumar Gupta
  2010-10-01  6:00 ` [PATCH 1/3 v5] AM35x: Add musb support Felipe Balbi
  0 siblings, 2 replies; 15+ messages in thread
From: Ajay Kumar Gupta @ 2010-09-30  5:19 UTC (permalink / raw)
  To: linux-usb; +Cc: linux-omap, balbi, Ajay Kumar Gupta

AM35x has musb interface (version 1.8) and uses CPPI41 DMA engine.
It has USB phy built inside the IP itself.

Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
---
Patch set created against latest linus's tree + Felipe's 14 patch set
for v2.6.37.

No change from v4.

 arch/arm/mach-omap2/board-am3517evm.c |   31 +++++++++++++++++++++++++++++++
 arch/arm/mach-omap2/usb-musb.c        |    4 ++++
 arch/arm/plat-omap/include/plat/usb.h |   21 +++++++++++++++++++++
 3 files changed, 56 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-omap2/board-am3517evm.c b/arch/arm/mach-omap2/board-am3517evm.c
index 4d0f585..6d352a2 100644
--- a/arch/arm/mach-omap2/board-am3517evm.c
+++ b/arch/arm/mach-omap2/board-am3517evm.c
@@ -35,6 +35,7 @@
 #include <plat/control.h>
 #include <plat/usb.h>
 #include <plat/display.h>
+#include <plat/control.h>
 
 #include "mux.h"
 
@@ -375,6 +376,31 @@ static void __init am3517_evm_init_irq(void)
 	omap_gpio_init();
 }
 
+static struct omap_musb_board_data musb_board_data = {
+	.interface_type         = MUSB_INTERFACE_ULPI,
+	.mode                   = MUSB_OTG,
+	.power                  = 500,
+};
+
+static __init void am3517_evm_musb_init(void)
+{
+	u32 devconf2;
+
+	/*
+	 * Set up USB clock/mode in the DEVCONF2 register.
+	 */
+	devconf2 = omap_ctrl_readl(AM35XX_CONTROL_DEVCONF2);
+
+	/* USB2.0 PHY reference clock is 13 MHz */
+	devconf2 &= ~(CONF2_REFFREQ | CONF2_OTGMODE | CONF2_PHY_GPIOMODE);
+	devconf2 |=  CONF2_REFFREQ_13MHZ | CONF2_SESENDEN | CONF2_VBDTCTEN
+			| CONF2_DATPOL;
+
+	omap_ctrl_writel(devconf2, AM35XX_CONTROL_DEVCONF2);
+
+	usb_musb_init(&musb_board_data);
+}
+
 static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
 	.port_mode[0] = EHCI_HCD_OMAP_MODE_PHY,
 #if defined(CONFIG_PANEL_SHARP_LQ043T1DG01) || \
@@ -393,6 +419,8 @@ static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
 
 #ifdef CONFIG_OMAP_MUX
 static struct omap_board_mux board_mux[] __initdata = {
+	/* USB OTG DRVVBUS offset = 0x212 */
+	OMAP3_MUX(SAD2D_MCAD23, OMAP_MUX_MODE0 | OMAP_PIN_INPUT_PULLDOWN),
 	{ .reg_offset = OMAP_MUX_TERMINATOR },
 };
 #else
@@ -459,6 +487,9 @@ static void __init am3517_evm_init(void)
 				ARRAY_SIZE(am3517evm_i2c1_boardinfo));
 	/*Ethernet*/
 	am3517_evm_ethernet_init(&am3517_evm_emac_pdata);
+
+	/* MUSB */
+	am3517_evm_musb_init();
 }
 
 MACHINE_START(OMAP3517EVM, "OMAP3517/AM3517 EVM")
diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c
index 33a5cde..7260558 100644
--- a/arch/arm/mach-omap2/usb-musb.c
+++ b/arch/arm/mach-omap2/usb-musb.c
@@ -28,6 +28,7 @@
 
 #include <mach/hardware.h>
 #include <mach/irqs.h>
+#include <mach/am35xx.h>
 #include <plat/usb.h>
 
 #ifdef CONFIG_USB_MUSB_SOC
@@ -89,6 +90,9 @@ void __init usb_musb_init(struct omap_musb_board_data *board_data)
 {
 	if (cpu_is_omap243x()) {
 		musb_resources[0].start = OMAP243X_HS_BASE;
+	} else if (cpu_is_omap3517() || cpu_is_omap3505()) {
+		musb_resources[0].start = AM35XX_IPSS_USBOTGSS_BASE;
+		musb_resources[1].start = INT_35XX_USBOTG_IRQ;
 	} else if (cpu_is_omap34xx()) {
 		musb_resources[0].start = OMAP34XX_HSUSB_OTG_BASE;
 	} else if (cpu_is_omap44xx()) {
diff --git a/arch/arm/plat-omap/include/plat/usb.h b/arch/arm/plat-omap/include/plat/usb.h
index 2a9427c..9feddac 100644
--- a/arch/arm/plat-omap/include/plat/usb.h
+++ b/arch/arm/plat-omap/include/plat/usb.h
@@ -218,6 +218,27 @@ static inline omap2_usbfs_init(struct omap_usb_config *pdata)
 #	define	USBT2TLL5PI		(1 << 17)
 #	define	USB0PUENACTLOI		(1 << 16)
 #	define	USBSTANDBYCTRL		(1 << 15)
+/* AM35x */
+/* USB 2.0 PHY Control */
+#define CONF2_PHY_GPIOMODE	(1 << 23)
+#define CONF2_OTGMODE		(3 << 14)
+#define CONF2_NO_OVERRIDE	(0 << 14)
+#define CONF2_FORCE_HOST	(1 << 14)
+#define CONF2_FORCE_DEVICE	(2 << 14)
+#define CONF2_FORCE_HOST_VBUS_LOW (3 << 14)
+#define CONF2_SESENDEN		(1 << 13)
+#define CONF2_VBDTCTEN		(1 << 12)
+#define CONF2_REFFREQ_24MHZ	(2 << 8)
+#define CONF2_REFFREQ_26MHZ	(7 << 8)
+#define CONF2_REFFREQ_13MHZ	(6 << 8)
+#define CONF2_REFFREQ		(0xf << 8)
+#define CONF2_PHYCLKGD		(1 << 7)
+#define CONF2_VBUSSENSE		(1 << 6)
+#define CONF2_PHY_PLLON		(1 << 5)
+#define CONF2_RESET		(1 << 4)
+#define CONF2_PHYPWRDN		(1 << 3)
+#define CONF2_OTGPWRDN		(1 << 2)
+#define CONF2_DATPOL		(1 << 1)
 
 #if defined(CONFIG_ARCH_OMAP1) && defined(CONFIG_USB)
 u32 omap1_usb0_init(unsigned nwires, unsigned is_device);
-- 
1.6.2.4


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [PATCH 2/3 v5] musb: add musb support for AM35x
  2010-09-30  5:19 [PATCH 1/3 v5] AM35x: Add musb support Ajay Kumar Gupta
@ 2010-09-30  5:19 ` Ajay Kumar Gupta
  2010-09-30  5:19   ` [PATCH 3/3 v5] musb: AM35x: Workaround for fifo read issue Ajay Kumar Gupta
       [not found]   ` <1285823949-27694-2-git-send-email-ajay.gupta-l0cyMroinI0@public.gmane.org>
  2010-10-01  6:00 ` [PATCH 1/3 v5] AM35x: Add musb support Felipe Balbi
  1 sibling, 2 replies; 15+ messages in thread
From: Ajay Kumar Gupta @ 2010-09-30  5:19 UTC (permalink / raw)
  To: linux-usb; +Cc: linux-omap, balbi, Ajay Kumar Gupta

AM35x has musb interface and uses CPPI4.1 DMA engine.
Current patch supports only PIO mode. DMA support can be
added later once basic CPPI4.1 DMA patch is accepted.

Also added USB_MUSB_AM35X which is required to differentiate musb ips
between OMAP3x and AM35x. This config would be used to for below
purposes,
        - Select am35x.c instead of omap2430.c for compilation
          at drivers/usb/musb directory. Please note there are
          significant differneces in these two files as musb ip
          in quite different on AM35x.
        - Select workaround codes applicable for AM35x musb issues.
          one such workaround is for bytewise read issue on AM35x.

Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
---
Changes from v4:
	- Added musb->phy_clock which is required to cleanup the
	  clock related stuff.
	- Renamed few macros
	- Modified copyright detail as per Sergei's comment.
	- Made USB_MUSB_AM35X config hidden and also modified it to
	  get selected based on 'default' field. This should allow
	  it to further scale for other boards based on AM35X.
	- Removed musb->set_clock.
 
 drivers/usb/musb/Kconfig     |   13 +-
 drivers/usb/musb/Makefile    |    4 +
 drivers/usb/musb/am35x.c     |  494 ++++++++++++++++++++++++++++++++++++++++++
 drivers/usb/musb/musb_core.h |    1 +
 4 files changed, 511 insertions(+), 1 deletions(-)
 create mode 100644 drivers/usb/musb/am35x.c

diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig
index 1dd21c2..e345ca9 100644
--- a/drivers/usb/musb/Kconfig
+++ b/drivers/usb/musb/Kconfig
@@ -60,6 +60,17 @@ comment "OMAP 44xx high speed USB support"
 comment "Blackfin high speed USB Support"
 	depends on USB_MUSB_HDRC && ((BF54x && !BF544) || (BF52x && !BF522 && !BF523))
 
+config USB_MUSB_AM35X
+	bool
+	depends on USB_MUSB_HDRC
+	select NOP_USB_XCEIV
+	default MACH_OMAP3517EVM
+	help
+	  Select this option if your platform is based on AM35x. As
+	  AM35x has an updated MUSB with CPPI4.1 DMA so this config
+	  is introduced to differentiate musb ip between OMAP3x and
+	  AM35x platforms.
+
 config USB_TUSB6010
 	boolean "TUSB 6010 support"
 	depends on USB_MUSB_HDRC && !USB_MUSB_SOC
@@ -147,7 +158,7 @@ config USB_MUSB_HDRC_HCD
 config MUSB_PIO_ONLY
 	bool 'Disable DMA (always use PIO)'
 	depends on USB_MUSB_HDRC
-	default USB_TUSB6010 || ARCH_DAVINCI_DA8XX
+	default USB_TUSB6010 || ARCH_DAVINCI_DA8XX || USB_MUSB_AM35X
 	help
 	  All data is copied between memory and FIFO by the CPU.
 	  DMA controllers are ignored.
diff --git a/drivers/usb/musb/Makefile b/drivers/usb/musb/Makefile
index f664ecf..217363d 100644
--- a/drivers/usb/musb/Makefile
+++ b/drivers/usb/musb/Makefile
@@ -23,7 +23,11 @@ ifeq ($(CONFIG_ARCH_OMAP2430),y)
 endif
 
 ifeq ($(CONFIG_ARCH_OMAP3430),y)
+   ifeq ($(CONFIG_USB_MUSB_AM35X),y)
+	musb_hdrc-objs  += am35x.o
+   else
 	musb_hdrc-objs	+= omap2430.o
+   endif
 endif
 
 ifeq ($(CONFIG_ARCH_OMAP4),y)
diff --git a/drivers/usb/musb/am35x.c b/drivers/usb/musb/am35x.c
new file mode 100644
index 0000000..53962a0
--- /dev/null
+++ b/drivers/usb/musb/am35x.c
@@ -0,0 +1,494 @@
+/*
+ * Texas Instruments AM35x "glue layer"
+ *
+ * Copyright (c) 2010, by Texas Instruments
+ *
+ * Based on the DA8xx "glue layer" code.
+ * Copyright (c) 2008-2009, MontaVista Software, Inc. <source@mvista.com>
+ *
+ * This file is part of the Inventra Controller Driver for Linux.
+ *
+ * The Inventra Controller Driver for Linux is free software; you
+ * can redistribute it and/or modify it under the terms of the GNU
+ * General Public License version 2 as published by the Free Software
+ * Foundation.
+ *
+ * The Inventra Controller Driver for Linux 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 The Inventra Controller Driver for Linux ; if not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place,
+ * Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#include <linux/init.h>
+#include <linux/clk.h>
+#include <linux/io.h>
+
+#include <plat/control.h>
+#include <plat/usb.h>
+
+#include "musb_core.h"
+
+/*
+ * AM35x specific definitions
+ */
+/* USB 2.0 OTG module registers */
+#define USB_REVISION_REG	0x00
+#define USB_CTRL_REG		0x04
+#define USB_STAT_REG		0x08
+#define USB_EMULATION_REG	0x0c
+/* 0x10 Reserved */
+#define USB_AUTOREQ_REG		0x14
+#define USB_SRP_FIX_TIME_REG	0x18
+#define USB_TEARDOWN_REG	0x1c
+#define EP_INTR_SRC_REG		0x20
+#define EP_INTR_SRC_SET_REG	0x24
+#define EP_INTR_SRC_CLEAR_REG	0x28
+#define EP_INTR_MASK_REG	0x2c
+#define EP_INTR_MASK_SET_REG	0x30
+#define EP_INTR_MASK_CLEAR_REG	0x34
+#define EP_INTR_SRC_MASKED_REG	0x38
+#define CORE_INTR_SRC_REG	0x40
+#define CORE_INTR_SRC_SET_REG	0x44
+#define CORE_INTR_SRC_CLEAR_REG	0x48
+#define CORE_INTR_MASK_REG	0x4c
+#define CORE_INTR_MASK_SET_REG	0x50
+#define CORE_INTR_MASK_CLEAR_REG 0x54
+#define CORE_INTR_SRC_MASKED_REG 0x58
+/* 0x5c Reserved */
+#define USB_END_OF_INTR_REG	0x60
+
+/* Control register bits */
+#define AM35X_SOFT_RESET_MASK	1
+
+/* USB interrupt register bits */
+#define AM35X_INTR_USB_SHIFT	16
+#define AM35X_INTR_USB_MASK	(0x1ff << AM35X_INTR_USB_SHIFT)
+#define AM35X_INTR_DRVVBUS	0x100
+#define AM35X_INTR_RX_SHIFT	16
+#define AM35X_INTR_TX_SHIFT	0
+#define AM35X_TX_EP_MASK	0xffff		/* EP0 + 15 Tx EPs */
+#define AM35X_RX_EP_MASK	0xfffe		/* 15 Rx EPs */
+#define AM35X_TX_INTR_MASK	(AM35X_TX_EP_MASK << AM35X_INTR_TX_SHIFT)
+#define AM35X_RX_INTR_MASK	(AM35X_RX_EP_MASK << AM35X_INTR_RX_SHIFT)
+
+#define USB_MENTOR_CORE_OFFSET	0x400
+
+static inline void phy_on(void)
+{
+	unsigned long timeout = jiffies + msecs_to_jiffies(100);
+	u32 devconf2;
+
+	/*
+	 * Start the on-chip PHY and its PLL.
+	 */
+	devconf2 = omap_ctrl_readl(AM35XX_CONTROL_DEVCONF2);
+
+	devconf2 &= ~(CONF2_RESET | CONF2_PHYPWRDN | CONF2_OTGPWRDN);
+	devconf2 |= CONF2_PHY_PLLON;
+
+	omap_ctrl_writel(devconf2, AM35XX_CONTROL_DEVCONF2);
+
+	DBG(1, "Waiting for PHY clock good...\n");
+	while (!(omap_ctrl_readl(AM35XX_CONTROL_DEVCONF2)
+			& CONF2_PHYCLKGD)) {
+		cpu_relax();
+
+		if (time_after(jiffies, timeout)) {
+			DBG(1, "musb PHY clock good timed out\n");
+			break;
+		}
+	}
+}
+
+static inline void phy_off(void)
+{
+	u32 devconf2;
+
+	/*
+	 * Power down the on-chip PHY.
+	 */
+	devconf2 = omap_ctrl_readl(AM35XX_CONTROL_DEVCONF2);
+
+	devconf2 &= ~CONF2_PHY_PLLON;
+	devconf2 |=  CONF2_PHYPWRDN | CONF2_OTGPWRDN;
+	omap_ctrl_writel(devconf2, AM35XX_CONTROL_DEVCONF2);
+}
+
+/*
+ * musb_platform_enable - enable interrupts
+ */
+void musb_platform_enable(struct musb *musb)
+{
+	void __iomem *reg_base = musb->ctrl_base;
+	u32 epmask;
+
+	/* Workaround: setup IRQs through both register sets. */
+	epmask = ((musb->epmask & AM35X_TX_EP_MASK) << AM35X_INTR_TX_SHIFT) |
+	       ((musb->epmask & AM35X_RX_EP_MASK) << AM35X_INTR_RX_SHIFT);
+
+	musb_writel(reg_base, EP_INTR_MASK_SET_REG, epmask);
+	musb_writel(reg_base, CORE_INTR_MASK_SET_REG, AM35X_INTR_USB_MASK);
+
+	/* Force the DRVVBUS IRQ so we can start polling for ID change. */
+	if (is_otg_enabled(musb))
+		musb_writel(reg_base, CORE_INTR_SRC_SET_REG,
+			    AM35X_INTR_DRVVBUS << AM35X_INTR_USB_SHIFT);
+}
+
+/*
+ * musb_platform_disable - disable HDRC and flush interrupts
+ */
+void musb_platform_disable(struct musb *musb)
+{
+	void __iomem *reg_base = musb->ctrl_base;
+
+	musb_writel(reg_base, CORE_INTR_MASK_CLEAR_REG, AM35X_INTR_USB_MASK);
+	musb_writel(reg_base, EP_INTR_MASK_CLEAR_REG,
+			 AM35X_TX_INTR_MASK | AM35X_RX_INTR_MASK);
+	musb_writeb(musb->mregs, MUSB_DEVCTL, 0);
+	musb_writel(reg_base, USB_END_OF_INTR_REG, 0);
+}
+
+#ifdef CONFIG_USB_MUSB_HDRC_HCD
+#define portstate(stmt)		stmt
+#else
+#define portstate(stmt)
+#endif
+
+static void am35x_set_vbus(struct musb *musb, int is_on)
+{
+	WARN_ON(is_on && is_peripheral_active(musb));
+}
+
+#define	POLL_SECONDS	2
+
+static struct timer_list otg_workaround;
+
+static void otg_timer(unsigned long _musb)
+{
+	struct musb		*musb = (void *)_musb;
+	void __iomem		*mregs = musb->mregs;
+	u8			devctl;
+	unsigned long		flags;
+
+	/*
+	 * We poll because AM35x's won't expose several OTG-critical
+	 * status change events (from the transceiver) otherwise.
+	 */
+	devctl = musb_readb(mregs, MUSB_DEVCTL);
+	DBG(7, "Poll devctl %02x (%s)\n", devctl, otg_state_string(musb));
+
+	spin_lock_irqsave(&musb->lock, flags);
+	switch (musb->xceiv->state) {
+	case OTG_STATE_A_WAIT_BCON:
+		devctl &= ~MUSB_DEVCTL_SESSION;
+		musb_writeb(musb->mregs, MUSB_DEVCTL, devctl);
+
+		devctl = musb_readb(musb->mregs, MUSB_DEVCTL);
+		if (devctl & MUSB_DEVCTL_BDEVICE) {
+			musb->xceiv->state = OTG_STATE_B_IDLE;
+			MUSB_DEV_MODE(musb);
+		} else {
+			musb->xceiv->state = OTG_STATE_A_IDLE;
+			MUSB_HST_MODE(musb);
+		}
+		break;
+	case OTG_STATE_A_WAIT_VFALL:
+		musb->xceiv->state = OTG_STATE_A_WAIT_VRISE;
+		musb_writel(musb->ctrl_base, CORE_INTR_SRC_SET_REG,
+			    MUSB_INTR_VBUSERROR << AM35X_INTR_USB_SHIFT);
+		break;
+	case OTG_STATE_B_IDLE:
+		if (!is_peripheral_enabled(musb))
+			break;
+
+		devctl = musb_readb(mregs, MUSB_DEVCTL);
+		if (devctl & MUSB_DEVCTL_BDEVICE)
+			mod_timer(&otg_workaround, jiffies + POLL_SECONDS * HZ);
+		else
+			musb->xceiv->state = OTG_STATE_A_IDLE;
+		break;
+	default:
+		break;
+	}
+	spin_unlock_irqrestore(&musb->lock, flags);
+}
+
+void musb_platform_try_idle(struct musb *musb, unsigned long timeout)
+{
+	static unsigned long last_timer;
+
+	if (!is_otg_enabled(musb))
+		return;
+
+	if (timeout == 0)
+		timeout = jiffies + msecs_to_jiffies(3);
+
+	/* Never idle if active, or when VBUS timeout is not set as host */
+	if (musb->is_active || (musb->a_wait_bcon == 0 &&
+				musb->xceiv->state == OTG_STATE_A_WAIT_BCON)) {
+		DBG(4, "%s active, deleting timer\n", otg_state_string(musb));
+		del_timer(&otg_workaround);
+		last_timer = jiffies;
+		return;
+	}
+
+	if (time_after(last_timer, timeout) && timer_pending(&otg_workaround)) {
+		DBG(4, "Longer idle timer already pending, ignoring...\n");
+		return;
+	}
+	last_timer = timeout;
+
+	DBG(4, "%s inactive, starting idle timer for %u ms\n",
+	    otg_state_string(musb), jiffies_to_msecs(timeout - jiffies));
+	mod_timer(&otg_workaround, timeout);
+}
+
+static irqreturn_t am35x_interrupt(int irq, void *hci)
+{
+	struct musb  *musb = hci;
+	void __iomem *reg_base = musb->ctrl_base;
+	unsigned long flags;
+	irqreturn_t ret = IRQ_NONE;
+	u32 epintr, usbintr, lvl_intr;
+
+	spin_lock_irqsave(&musb->lock, flags);
+
+	/* Get endpoint interrupts */
+	epintr = musb_readl(reg_base, EP_INTR_SRC_MASKED_REG);
+
+	if (epintr) {
+		musb_writel(reg_base, EP_INTR_SRC_CLEAR_REG, epintr);
+
+		musb->int_rx =
+			(epintr & AM35X_RX_INTR_MASK) >> AM35X_INTR_RX_SHIFT;
+		musb->int_tx =
+			(epintr & AM35X_TX_INTR_MASK) >> AM35X_INTR_TX_SHIFT;
+	}
+
+	/* Get usb core interrupts */
+	usbintr = musb_readl(reg_base, CORE_INTR_SRC_MASKED_REG);
+	if (!usbintr && !epintr)
+		goto eoi;
+
+	if (usbintr) {
+		musb_writel(reg_base, CORE_INTR_SRC_CLEAR_REG, usbintr);
+
+		musb->int_usb =
+			(usbintr & AM35X_INTR_USB_MASK) >> AM35X_INTR_USB_SHIFT;
+	}
+	/*
+	 * DRVVBUS IRQs are the only proxy we have (a very poor one!) for
+	 * AM35x's missing ID change IRQ.  We need an ID change IRQ to
+	 * switch appropriately between halves of the OTG state machine.
+	 * Managing DEVCTL.SESSION per Mentor docs requires that we know its
+	 * value but DEVCTL.BDEVICE is invalid without DEVCTL.SESSION set.
+	 * Also, DRVVBUS pulses for SRP (but not at 5V) ...
+	 */
+	if (usbintr & (AM35X_INTR_DRVVBUS << AM35X_INTR_USB_SHIFT)) {
+		int drvvbus = musb_readl(reg_base, USB_STAT_REG);
+		void __iomem *mregs = musb->mregs;
+		u8 devctl = musb_readb(mregs, MUSB_DEVCTL);
+		int err;
+
+		err = is_host_enabled(musb) && (musb->int_usb &
+						MUSB_INTR_VBUSERROR);
+		if (err) {
+			/*
+			 * The Mentor core doesn't debounce VBUS as needed
+			 * to cope with device connect current spikes. This
+			 * means it's not uncommon for bus-powered devices
+			 * to get VBUS errors during enumeration.
+			 *
+			 * This is a workaround, but newer RTL from Mentor
+			 * seems to allow a better one: "re"-starting sessions
+			 * without waiting for VBUS to stop registering in
+			 * devctl.
+			 */
+			musb->int_usb &= ~MUSB_INTR_VBUSERROR;
+			musb->xceiv->state = OTG_STATE_A_WAIT_VFALL;
+			mod_timer(&otg_workaround, jiffies + POLL_SECONDS * HZ);
+			WARNING("VBUS error workaround (delay coming)\n");
+		} else if (is_host_enabled(musb) && drvvbus) {
+			MUSB_HST_MODE(musb);
+			musb->xceiv->default_a = 1;
+			musb->xceiv->state = OTG_STATE_A_WAIT_VRISE;
+			portstate(musb->port1_status |= USB_PORT_STAT_POWER);
+			del_timer(&otg_workaround);
+		} else {
+			musb->is_active = 0;
+			MUSB_DEV_MODE(musb);
+			musb->xceiv->default_a = 0;
+			musb->xceiv->state = OTG_STATE_B_IDLE;
+			portstate(musb->port1_status &= ~USB_PORT_STAT_POWER);
+		}
+
+		/* NOTE: this must complete power-on within 100 ms. */
+		DBG(2, "VBUS %s (%s)%s, devctl %02x\n",
+				drvvbus ? "on" : "off",
+				otg_state_string(musb),
+				err ? " ERROR" : "",
+				devctl);
+		ret = IRQ_HANDLED;
+	}
+
+	if (musb->int_tx || musb->int_rx || musb->int_usb)
+		ret |= musb_interrupt(musb);
+
+eoi:
+	/* EOI needs to be written for the IRQ to be re-asserted. */
+	if (ret == IRQ_HANDLED || epintr || usbintr) {
+		/* clear level interrupt */
+		lvl_intr = omap_ctrl_readl(AM35XX_CONTROL_LVL_INTR_CLEAR);
+		lvl_intr |= AM35XX_USBOTGSS_INT_CLR;
+		omap_ctrl_writel(lvl_intr, AM35XX_CONTROL_LVL_INTR_CLEAR);
+		/* write EOI */
+		musb_writel(reg_base, USB_END_OF_INTR_REG, 0);
+	}
+
+	/* Poll for ID change */
+	if (is_otg_enabled(musb) && musb->xceiv->state == OTG_STATE_B_IDLE)
+		mod_timer(&otg_workaround, jiffies + POLL_SECONDS * HZ);
+
+	spin_unlock_irqrestore(&musb->lock, flags);
+
+	return ret;
+}
+
+int musb_platform_set_mode(struct musb *musb, u8 musb_mode)
+{
+	u32 devconf2 = omap_ctrl_readl(AM35XX_CONTROL_DEVCONF2);
+
+	devconf2 &= ~CONF2_OTGMODE;
+	switch (musb_mode) {
+#ifdef	CONFIG_USB_MUSB_HDRC_HCD
+	case MUSB_HOST:		/* Force VBUS valid, ID = 0 */
+		devconf2 |= CONF2_FORCE_HOST;
+		break;
+#endif
+#ifdef	CONFIG_USB_GADGET_MUSB_HDRC
+	case MUSB_PERIPHERAL:	/* Force VBUS valid, ID = 1 */
+		devconf2 |= CONF2_FORCE_DEVICE;
+		break;
+#endif
+#ifdef	CONFIG_USB_MUSB_OTG
+	case MUSB_OTG:		/* Don't override the VBUS/ID comparators */
+		devconf2 |= CONF2_NO_OVERRIDE;
+		break;
+#endif
+	default:
+		DBG(2, "Trying to set unsupported mode %u\n", musb_mode);
+	}
+
+	omap_ctrl_writel(devconf2, AM35XX_CONTROL_DEVCONF2);
+	return 0;
+}
+
+int __init musb_platform_init(struct musb *musb, void *board_data)
+{
+	void __iomem *reg_base = musb->ctrl_base;
+	u32 rev, lvl_intr, sw_reset;
+	int status;
+
+	musb->mregs += USB_MENTOR_CORE_OFFSET;
+
+	clk_enable(musb->clock);
+	DBG(2, "musb->clock=%lud\n", clk_get_rate(musb->clock));
+
+	musb->phy_clock = clk_get(musb->controller, "fck");
+	if (IS_ERR(musb->phy_clock)) {
+		status = PTR_ERR(musb->phy_clock);
+		goto exit0;
+	}
+	clk_enable(musb->phy_clock);
+	DBG(2, "musb->phy_clock=%lud\n", clk_get_rate(musb->phy_clock));
+
+	/* Returns zero if e.g. not clocked */
+	rev = musb_readl(reg_base, USB_REVISION_REG);
+	if (!rev) {
+		status = -ENODEV;
+		goto exit1;
+	}
+
+	usb_nop_xceiv_register();
+	musb->xceiv = otg_get_transceiver();
+	if (!musb->xceiv) {
+		status = -ENODEV;
+		goto exit1;
+	}
+
+	if (is_host_enabled(musb))
+		setup_timer(&otg_workaround, otg_timer, (unsigned long) musb);
+
+	musb->board_set_vbus = am35x_set_vbus;
+
+	/* Global reset */
+	sw_reset = omap_ctrl_readl(AM35XX_CONTROL_IP_SW_RESET);
+
+	sw_reset |= AM35XX_USBOTGSS_SW_RST;
+	omap_ctrl_writel(sw_reset, AM35XX_CONTROL_IP_SW_RESET);
+
+	sw_reset &= ~AM35XX_USBOTGSS_SW_RST;
+	omap_ctrl_writel(sw_reset, AM35XX_CONTROL_IP_SW_RESET);
+
+	/* Reset the controller */
+	musb_writel(reg_base, USB_CTRL_REG, AM35X_SOFT_RESET_MASK);
+
+	/* Start the on-chip PHY and its PLL. */
+	phy_on();
+
+	msleep(5);
+
+	musb->isr = am35x_interrupt;
+
+	/* clear level interrupt */
+	lvl_intr = omap_ctrl_readl(AM35XX_CONTROL_LVL_INTR_CLEAR);
+	lvl_intr |= AM35XX_USBOTGSS_INT_CLR;
+	omap_ctrl_writel(lvl_intr, AM35XX_CONTROL_LVL_INTR_CLEAR);
+	return 0;
+exit1:
+	clk_disable(musb->phy_clock);
+	clk_put(musb->phy_clock);
+exit0:
+	clk_disable(musb->clock);
+	return status;
+}
+
+int musb_platform_exit(struct musb *musb)
+{
+	if (is_host_enabled(musb))
+		del_timer_sync(&otg_workaround);
+
+	phy_off();
+
+	otg_put_transceiver(musb->xceiv);
+	usb_nop_xceiv_unregister();
+
+	clk_disable(musb->clock);
+
+	clk_disable(musb->phy_clock);
+	clk_put(musb->phy_clock);
+
+	return 0;
+}
+
+#ifdef CONFIG_PM
+void musb_platform_save_context(struct musb *musb,
+	struct musb_context_registers *musb_context)
+{
+	phy_off();
+}
+
+void musb_platform_restore_context(struct musb *musb,
+	struct musb_context_registers *musb_context)
+{
+	phy_on();
+}
+#endif
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
index 2a82362..69797e5 100644
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -330,6 +330,7 @@ struct musb {
 	/* device lock */
 	spinlock_t		lock;
 	struct clk		*clock;
+	struct clk		*phy_clock;
 	irqreturn_t		(*isr)(int, void *);
 	struct work_struct	irq_work;
 	u16			hwvers;
-- 
1.6.2.4


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [PATCH 3/3 v5] musb: AM35x: Workaround for fifo read issue
  2010-09-30  5:19 ` [PATCH 2/3 v5] musb: add musb support for AM35x Ajay Kumar Gupta
@ 2010-09-30  5:19   ` Ajay Kumar Gupta
       [not found]   ` <1285823949-27694-2-git-send-email-ajay.gupta-l0cyMroinI0@public.gmane.org>
  1 sibling, 0 replies; 15+ messages in thread
From: Ajay Kumar Gupta @ 2010-09-30  5:19 UTC (permalink / raw)
  To: linux-usb; +Cc: linux-omap, balbi, Ajay Kumar Gupta

AM35x supports only 32bit read operations so we need to have
workaround for 8bit and 16bit read operations.

Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
---
No logical change from v4.

 drivers/usb/musb/am35x.c     |   30 ++++++++++++++++++++++++++++++
 drivers/usb/musb/musb_core.c |    2 ++
 2 files changed, 32 insertions(+), 0 deletions(-)

diff --git a/drivers/usb/musb/am35x.c b/drivers/usb/musb/am35x.c
index 53962a0..b0aabf3 100644
--- a/drivers/usb/musb/am35x.c
+++ b/drivers/usb/musb/am35x.c
@@ -492,3 +492,33 @@ void musb_platform_restore_context(struct musb *musb,
 	phy_on();
 }
 #endif
+
+/* AM35x supports only 32bit read operation */
+void musb_read_fifo(struct musb_hw_ep *hw_ep, u16 len, u8 *dst)
+{
+	void __iomem *fifo = hw_ep->fifo;
+	u32		val;
+	int		i;
+
+	/* Read for 32bit-aligned destination address */
+	if (likely((0x03 & (unsigned long) dst) == 0) && len >= 4) {
+		readsl(fifo, dst, len >> 2);
+		dst += len & ~0x03;
+		len &= 0x03;
+	}
+	/*
+	 * Now read the remaining 1 to 3 byte or complete length if
+	 * unaligned address.
+	 */
+	if (len > 4) {
+		for (i = 0; i < (len >> 2); i++) {
+			*(u32 *) dst = musb_readl(fifo, 0);
+			dst += 4;
+		}
+		len &= 0x03;
+	}
+	if (len > 0) {
+		val = musb_readl(fifo, 0);
+		memcpy(dst, &val, len);
+	}
+}
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 472b2a7..f03a2aa 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -272,6 +272,7 @@ void musb_write_fifo(struct musb_hw_ep *hw_ep, u16 len, const u8 *src)
 	}
 }
 
+#if !defined(CONFIG_USB_MUSB_AM35X)
 /*
  * Unload an endpoint's FIFO
  */
@@ -309,6 +310,7 @@ void musb_read_fifo(struct musb_hw_ep *hw_ep, u16 len, u8 *dst)
 		readsb(fifo, dst, len);
 	}
 }
+#endif
 
 #endif	/* normal PIO */
 
-- 
1.6.2.4


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* Re: [PATCH 1/3 v5] AM35x: Add musb support
  2010-09-30  5:19 [PATCH 1/3 v5] AM35x: Add musb support Ajay Kumar Gupta
  2010-09-30  5:19 ` [PATCH 2/3 v5] musb: add musb support for AM35x Ajay Kumar Gupta
@ 2010-10-01  6:00 ` Felipe Balbi
       [not found]   ` <20101001060037.GC2925-UiBtZHVXSwEVvW8u9ZQWYwjfymiNCTlR@public.gmane.org>
  1 sibling, 1 reply; 15+ messages in thread
From: Felipe Balbi @ 2010-10-01  6:00 UTC (permalink / raw)
  To: Gupta, Ajay Kumar
  Cc: linux-usb@vger.kernel.org, linux-omap@vger.kernel.org,
	Balbi, Felipe

Hi,

On Thu, Sep 30, 2010 at 12:19:07AM -0500, Gupta, Ajay Kumar wrote:
>AM35x has musb interface (version 1.8) and uses CPPI41 DMA engine.
>It has USB phy built inside the IP itself.
>
>Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>

besides the one small question below:

Acked-by: Felipe Balbi <balbi@ti.com>

(note that I don't have that board to fully test this patch)

>+static struct omap_musb_board_data musb_board_data = {
>+	.interface_type         = MUSB_INTERFACE_ULPI,
>+	.mode                   = MUSB_OTG,
>+	.power                  = 500,

can this board really source 500mA ??

-- 
balbi

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PATCH 2/3 v5] musb: add musb support for AM35x
       [not found]   ` <1285823949-27694-2-git-send-email-ajay.gupta-l0cyMroinI0@public.gmane.org>
@ 2010-10-01  6:02     ` Felipe Balbi
       [not found]       ` <20101001060203.GD2925-UiBtZHVXSwEVvW8u9ZQWYwjfymiNCTlR@public.gmane.org>
  0 siblings, 1 reply; 15+ messages in thread
From: Felipe Balbi @ 2010-10-01  6:02 UTC (permalink / raw)
  To: Gupta, Ajay Kumar
  Cc: linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Balbi, Felipe

On Thu, Sep 30, 2010 at 12:19:08AM -0500, Gupta, Ajay Kumar wrote:
>AM35x has musb interface and uses CPPI4.1 DMA engine.
>Current patch supports only PIO mode. DMA support can be
>added later once basic CPPI4.1 DMA patch is accepted.
>
>Also added USB_MUSB_AM35X which is required to differentiate musb ips
>between OMAP3x and AM35x. This config would be used to for below
>purposes,
>        - Select am35x.c instead of omap2430.c for compilation
>          at drivers/usb/musb directory. Please note there are
>          significant differneces in these two files as musb ip
>          in quite different on AM35x.
>        - Select workaround codes applicable for AM35x musb issues.
>          one such workaround is for bytewise read issue on AM35x.
>
>Signed-off-by: Ajay Kumar Gupta <ajay.gupta-l0cyMroinI0@public.gmane.org>

this one doesn't apply of top of my musb-2.6.37 branch.

patching file drivers/usb/musb/Kconfig
Hunk #1 succeeded at 60 with fuzz 2.
Hunk #2 FAILED at 158.
1 out of 2 hunks FAILED -- saving rejects to file drivers/usb/musb/Kconfig.rej
patching file drivers/usb/musb/Makefile
Hunk #1 FAILED at 23.
1 out of 1 hunk FAILED -- saving rejects to file drivers/usb/musb/Makefile.rej
patching file drivers/usb/musb/am35x.c
patching file drivers/usb/musb/musb_core.h
Hunk #1 FAILED at 330.
1 out of 1 hunk FAILED -- saving rejects to file drivers/usb/musb/musb_core.h.rej

could you refresh and resend this one ??

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

^ permalink raw reply	[flat|nested] 15+ messages in thread

* RE: [PATCH 1/3 v5] AM35x: Add musb support
       [not found]   ` <20101001060037.GC2925-UiBtZHVXSwEVvW8u9ZQWYwjfymiNCTlR@public.gmane.org>
@ 2010-10-01  6:19     ` Gupta, Ajay Kumar
  2010-10-04 17:28     ` Tony Lindgren
  1 sibling, 0 replies; 15+ messages in thread
From: Gupta, Ajay Kumar @ 2010-10-01  6:19 UTC (permalink / raw)
  To: Balbi, Felipe
  Cc: linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org

Hi,

> On Thu, Sep 30, 2010 at 12:19:07AM -0500, Gupta, Ajay Kumar wrote:
> >AM35x has musb interface (version 1.8) and uses CPPI41 DMA engine.
> >It has USB phy built inside the IP itself.
> >
> >Signed-off-by: Ajay Kumar Gupta <ajay.gupta-l0cyMroinI0@public.gmane.org>
> 
> besides the one small question below:
> 
> Acked-by: Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org>
> 
> (note that I don't have that board to fully test this patch)
> 
> >+static struct omap_musb_board_data musb_board_data = {
> >+	.interface_type         = MUSB_INTERFACE_ULPI,
> >+	.mode                   = MUSB_OTG,
> >+	.power                  = 500,

> can this board really source 500mA ??
Yes, it supports upto 500mA same as OMAP3EVM (Rev-G).

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

^ permalink raw reply	[flat|nested] 15+ messages in thread

* RE: [PATCH 2/3 v5] musb: add musb support for AM35x
       [not found]       ` <20101001060203.GD2925-UiBtZHVXSwEVvW8u9ZQWYwjfymiNCTlR@public.gmane.org>
@ 2010-10-01  6:21         ` Gupta, Ajay Kumar
       [not found]           ` <19F8576C6E063C45BE387C64729E739404A9D8AFF0-/tLxBxkBPtCIQmiDNMet8wC/G2K4zDHf@public.gmane.org>
  0 siblings, 1 reply; 15+ messages in thread
From: Gupta, Ajay Kumar @ 2010-10-01  6:21 UTC (permalink / raw)
  To: Balbi, Felipe
  Cc: linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org

Hi,
> On Thu, Sep 30, 2010 at 12:19:08AM -0500, Gupta, Ajay Kumar wrote:
> >AM35x has musb interface and uses CPPI4.1 DMA engine.
> >Current patch supports only PIO mode. DMA support can be
> >added later once basic CPPI4.1 DMA patch is accepted.
> >
> >Also added USB_MUSB_AM35X which is required to differentiate musb ips
> >between OMAP3x and AM35x. This config would be used to for below
> >purposes,
> >        - Select am35x.c instead of omap2430.c for compilation
> >          at drivers/usb/musb directory. Please note there are
> >          significant differneces in these two files as musb ip
> >          in quite different on AM35x.
> >        - Select workaround codes applicable for AM35x musb issues.
> >          one such workaround is for bytewise read issue on AM35x.
> >
> >Signed-off-by: Ajay Kumar Gupta <ajay.gupta-l0cyMroinI0@public.gmane.org>
> 
> this one doesn't apply of top of my musb-2.6.37 branch.
[...]
> could you refresh and resend this one ??

I couldn't fetch your gitorious tree so I just applied 14 patch set
Manually on my branch.

Anyways I will look into it and send the refreshed patch shortly.

Thanks,
Ajay
> 
[...]
--
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

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PATCH 2/3 v5] musb: add musb support for AM35x
       [not found]           ` <19F8576C6E063C45BE387C64729E739404A9D8AFF0-/tLxBxkBPtCIQmiDNMet8wC/G2K4zDHf@public.gmane.org>
@ 2010-10-01  6:23             ` Felipe Balbi
       [not found]               ` <20101001062318.GG2925-UiBtZHVXSwEVvW8u9ZQWYwjfymiNCTlR@public.gmane.org>
  0 siblings, 1 reply; 15+ messages in thread
From: Felipe Balbi @ 2010-10-01  6:23 UTC (permalink / raw)
  To: Gupta, Ajay Kumar
  Cc: Balbi, Felipe, linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org

On Fri, Oct 01, 2010 at 01:21:33AM -0500, Gupta, Ajay Kumar wrote:
>Hi,
>> On Thu, Sep 30, 2010 at 12:19:08AM -0500, Gupta, Ajay Kumar wrote:
>> >AM35x has musb interface and uses CPPI4.1 DMA engine.
>> >Current patch supports only PIO mode. DMA support can be
>> >added later once basic CPPI4.1 DMA patch is accepted.
>> >
>> >Also added USB_MUSB_AM35X which is required to differentiate musb ips
>> >between OMAP3x and AM35x. This config would be used to for below
>> >purposes,
>> >        - Select am35x.c instead of omap2430.c for compilation
>> >          at drivers/usb/musb directory. Please note there are
>> >          significant differneces in these two files as musb ip
>> >          in quite different on AM35x.
>> >        - Select workaround codes applicable for AM35x musb issues.
>> >          one such workaround is for bytewise read issue on AM35x.
>> >
>> >Signed-off-by: Ajay Kumar Gupta <ajay.gupta-l0cyMroinI0@public.gmane.org>
>>
>> this one doesn't apply of top of my musb-2.6.37 branch.
>[...]
>> could you refresh and resend this one ??
>
>I couldn't fetch your gitorious tree so I just applied 14 patch set
>Manually on my branch.
>
>Anyways I will look into it and send the refreshed patch shortly.

gitorious must be trying to make me look bad :-p

Works like a charm here. Will try on a different laptop

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

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PATCH 2/3 v5] musb: add musb support for AM35x
       [not found]               ` <20101001062318.GG2925-UiBtZHVXSwEVvW8u9ZQWYwjfymiNCTlR@public.gmane.org>
@ 2010-10-01  6:25                 ` Felipe Balbi
  2010-10-01  6:33                   ` Gupta, Ajay Kumar
  0 siblings, 1 reply; 15+ messages in thread
From: Felipe Balbi @ 2010-10-01  6:25 UTC (permalink / raw)
  To: Balbi, Felipe
  Cc: Gupta, Ajay Kumar,
	linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org

On Fri, Oct 01, 2010 at 01:23:18AM -0500, Balbi, Felipe wrote:
>On Fri, Oct 01, 2010 at 01:21:33AM -0500, Gupta, Ajay Kumar wrote:
>>Hi,
>>> On Thu, Sep 30, 2010 at 12:19:08AM -0500, Gupta, Ajay Kumar wrote:
>>> >AM35x has musb interface and uses CPPI4.1 DMA engine.
>>> >Current patch supports only PIO mode. DMA support can be
>>> >added later once basic CPPI4.1 DMA patch is accepted.
>>> >
>>> >Also added USB_MUSB_AM35X which is required to differentiate musb ips
>>> >between OMAP3x and AM35x. This config would be used to for below
>>> >purposes,
>>> >        - Select am35x.c instead of omap2430.c for compilation
>>> >          at drivers/usb/musb directory. Please note there are
>>> >          significant differneces in these two files as musb ip
>>> >          in quite different on AM35x.
>>> >        - Select workaround codes applicable for AM35x musb issues.
>>> >          one such workaround is for bytewise read issue on AM35x.
>>> >
>>> >Signed-off-by: Ajay Kumar Gupta <ajay.gupta-l0cyMroinI0@public.gmane.org>
>>>
>>> this one doesn't apply of top of my musb-2.6.37 branch.
>>[...]
>>> could you refresh and resend this one ??
>>
>>I couldn't fetch your gitorious tree so I just applied 14 patch set
>>Manually on my branch.
>>
>>Anyways I will look into it and send the refreshed patch shortly.
>
>gitorious must be trying to make me look bad :-p
>
>Works like a charm here. Will try on a different laptop

fine on another laptop too. Maybe you need to check your .git/config

the correct address is git://gitorious.org/usb/usb.git

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

^ permalink raw reply	[flat|nested] 15+ messages in thread

* RE: [PATCH 2/3 v5] musb: add musb support for AM35x
  2010-10-01  6:25                 ` Felipe Balbi
@ 2010-10-01  6:33                   ` Gupta, Ajay Kumar
       [not found]                     ` <19F8576C6E063C45BE387C64729E739404A9D8B005-/tLxBxkBPtCIQmiDNMet8wC/G2K4zDHf@public.gmane.org>
  0 siblings, 1 reply; 15+ messages in thread
From: Gupta, Ajay Kumar @ 2010-10-01  6:33 UTC (permalink / raw)
  To: Balbi, Felipe; +Cc: linux-usb@vger.kernel.org, linux-omap@vger.kernel.org

Hi,
[...]
> >>I couldn't fetch your gitorious tree so I just applied 14 patch set
> >>Manually on my branch.
> >>
> >>Anyways I will look into it and send the refreshed patch shortly.
> >
> >gitorious must be trying to make me look bad :-p
> >
> >Works like a charm here. Will try on a different laptop
> 
> fine on another laptop too. Maybe you need to check your .git/config
> 
> the correct address is git://gitorious.org/usb/usb.git

I am using same address (http one) but fetch always fails while getting
Index pack,
484a70e99b430800a9d93198bae32df155aecfc9

Retrying..

-Ajay
> 
> --
> balbi

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PATCH 2/3 v5] musb: add musb support for AM35x
       [not found]                     ` <19F8576C6E063C45BE387C64729E739404A9D8B005-/tLxBxkBPtCIQmiDNMet8wC/G2K4zDHf@public.gmane.org>
@ 2010-10-01  6:48                       ` Felipe Balbi
  2010-10-04  8:32                         ` Felipe Balbi
  0 siblings, 1 reply; 15+ messages in thread
From: Felipe Balbi @ 2010-10-01  6:48 UTC (permalink / raw)
  To: Gupta, Ajay Kumar
  Cc: Balbi, Felipe, linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org

On Fri, Oct 01, 2010 at 01:33:49AM -0500, Gupta, Ajay Kumar wrote:
>Hi,
>[...]
>> >>I couldn't fetch your gitorious tree so I just applied 14 patch set
>> >>Manually on my branch.
>> >>
>> >>Anyways I will look into it and send the refreshed patch shortly.
>> >
>> >gitorious must be trying to make me look bad :-p
>> >
>> >Works like a charm here. Will try on a different laptop
>>
>> fine on another laptop too. Maybe you need to check your .git/config
>>
>> the correct address is git://gitorious.org/usb/usb.git
>
>I am using same address (http one) but fetch always fails while getting
>Index pack,
>484a70e99b430800a9d93198bae32df155aecfc9

try to get it via git instead of http.

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

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PATCH 2/3 v5] musb: add musb support for AM35x
  2010-10-01  6:48                       ` Felipe Balbi
@ 2010-10-04  8:32                         ` Felipe Balbi
  0 siblings, 0 replies; 15+ messages in thread
From: Felipe Balbi @ 2010-10-04  8:32 UTC (permalink / raw)
  To: Balbi, Felipe
  Cc: Gupta, Ajay Kumar, linux-usb@vger.kernel.org,
	linux-omap@vger.kernel.org

On Fri, Oct 01, 2010 at 01:48:57AM -0500, Balbi, Felipe wrote:
>On Fri, Oct 01, 2010 at 01:33:49AM -0500, Gupta, Ajay Kumar wrote:
>>Hi,
>>[...]
>>> >>I couldn't fetch your gitorious tree so I just applied 14 patch set
>>> >>Manually on my branch.
>>> >>
>>> >>Anyways I will look into it and send the refreshed patch shortly.
>>> >
>>> >gitorious must be trying to make me look bad :-p
>>> >
>>> >Works like a charm here. Will try on a different laptop
>>>
>>> fine on another laptop too. Maybe you need to check your .git/config
>>>
>>> the correct address is git://gitorious.org/usb/usb.git
>>
>>I am using same address (http one) but fetch always fails while getting
>>Index pack,
>>484a70e99b430800a9d93198bae32df155aecfc9
>
>try to get it via git instead of http.

seems like our servers converted TABs into spaces. Would you send
(privately, even) a tarball with all the patches ??

-- 
balbi

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PATCH 1/3 v5] AM35x: Add musb support
       [not found]   ` <20101001060037.GC2925-UiBtZHVXSwEVvW8u9ZQWYwjfymiNCTlR@public.gmane.org>
  2010-10-01  6:19     ` Gupta, Ajay Kumar
@ 2010-10-04 17:28     ` Tony Lindgren
  2010-10-05  5:41       ` Felipe Balbi
  1 sibling, 1 reply; 15+ messages in thread
From: Tony Lindgren @ 2010-10-04 17:28 UTC (permalink / raw)
  To: Felipe Balbi
  Cc: Gupta, Ajay Kumar,
	linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org

* Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org> [100930 22:52]:
> Hi,
> 
> On Thu, Sep 30, 2010 at 12:19:07AM -0500, Gupta, Ajay Kumar wrote:
> >AM35x has musb interface (version 1.8) and uses CPPI41 DMA engine.
> >It has USB phy built inside the IP itself.
> >
> >Signed-off-by: Ajay Kumar Gupta <ajay.gupta-l0cyMroinI0@public.gmane.org>
> 
> besides the one small question below:
> 
> Acked-by: Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org>

Felipe, I'm assuming you're queuing up the omap USB platform data
patches. So not picking up these patches.

Also, please also note that the arch/arm/*omap*/ patches should
be posted with both linux-omap and linux-arm-kernel mailing lists
Cc'd.

Regards,

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

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PATCH 1/3 v5] AM35x: Add musb support
  2010-10-04 17:28     ` Tony Lindgren
@ 2010-10-05  5:41       ` Felipe Balbi
       [not found]         ` <20101005054111.GC2643-UiBtZHVXSwEVvW8u9ZQWYwjfymiNCTlR@public.gmane.org>
  0 siblings, 1 reply; 15+ messages in thread
From: Felipe Balbi @ 2010-10-05  5:41 UTC (permalink / raw)
  To: Tony Lindgren
  Cc: Balbi, Felipe, Gupta, Ajay Kumar, linux-usb@vger.kernel.org,
	linux-omap@vger.kernel.org

On Mon, Oct 04, 2010 at 12:28:14PM -0500, Tony Lindgren wrote:
>* Felipe Balbi <balbi@ti.com> [100930 22:52]:
>> Hi,
>>
>> On Thu, Sep 30, 2010 at 12:19:07AM -0500, Gupta, Ajay Kumar wrote:
>> >AM35x has musb interface (version 1.8) and uses CPPI41 DMA engine.
>> >It has USB phy built inside the IP itself.
>> >
>> >Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
>>
>> besides the one small question below:
>>
>> Acked-by: Felipe Balbi <balbi@ti.com>
>
>Felipe, I'm assuming you're queuing up the omap USB platform data
>patches. So not picking up these patches.
>
>Also, please also note that the arch/arm/*omap*/ patches should
>be posted with both linux-omap and linux-arm-kernel mailing lists
>Cc'd.

I'll queue it throught Greg. Can I get your Acked-by ?

-- 
balbi

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PATCH 1/3 v5] AM35x: Add musb support
       [not found]         ` <20101005054111.GC2643-UiBtZHVXSwEVvW8u9ZQWYwjfymiNCTlR@public.gmane.org>
@ 2010-10-05 18:34           ` Tony Lindgren
  0 siblings, 0 replies; 15+ messages in thread
From: Tony Lindgren @ 2010-10-05 18:34 UTC (permalink / raw)
  To: Felipe Balbi
  Cc: Gupta, Ajay Kumar,
	linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org

* Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org> [101004 22:32]:
> On Mon, Oct 04, 2010 at 12:28:14PM -0500, Tony Lindgren wrote:
> >* Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org> [100930 22:52]:
> >>Hi,
> >>
> >>On Thu, Sep 30, 2010 at 12:19:07AM -0500, Gupta, Ajay Kumar wrote:
> >>>AM35x has musb interface (version 1.8) and uses CPPI41 DMA engine.
> >>>It has USB phy built inside the IP itself.
> >>>
> >>>Signed-off-by: Ajay Kumar Gupta <ajay.gupta-l0cyMroinI0@public.gmane.org>
> >>
> >>besides the one small question below:
> >>
> >>Acked-by: Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org>
> >
> >Felipe, I'm assuming you're queuing up the omap USB platform data
> >patches. So not picking up these patches.
> >
> >Also, please also note that the arch/arm/*omap*/ patches should
> >be posted with both linux-omap and linux-arm-kernel mailing lists
> >Cc'd.
> 
> I'll queue it throught Greg. Can I get your Acked-by ?

Acked-by: Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
--
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

^ permalink raw reply	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2010-10-05 18:34 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-30  5:19 [PATCH 1/3 v5] AM35x: Add musb support Ajay Kumar Gupta
2010-09-30  5:19 ` [PATCH 2/3 v5] musb: add musb support for AM35x Ajay Kumar Gupta
2010-09-30  5:19   ` [PATCH 3/3 v5] musb: AM35x: Workaround for fifo read issue Ajay Kumar Gupta
     [not found]   ` <1285823949-27694-2-git-send-email-ajay.gupta-l0cyMroinI0@public.gmane.org>
2010-10-01  6:02     ` [PATCH 2/3 v5] musb: add musb support for AM35x Felipe Balbi
     [not found]       ` <20101001060203.GD2925-UiBtZHVXSwEVvW8u9ZQWYwjfymiNCTlR@public.gmane.org>
2010-10-01  6:21         ` Gupta, Ajay Kumar
     [not found]           ` <19F8576C6E063C45BE387C64729E739404A9D8AFF0-/tLxBxkBPtCIQmiDNMet8wC/G2K4zDHf@public.gmane.org>
2010-10-01  6:23             ` Felipe Balbi
     [not found]               ` <20101001062318.GG2925-UiBtZHVXSwEVvW8u9ZQWYwjfymiNCTlR@public.gmane.org>
2010-10-01  6:25                 ` Felipe Balbi
2010-10-01  6:33                   ` Gupta, Ajay Kumar
     [not found]                     ` <19F8576C6E063C45BE387C64729E739404A9D8B005-/tLxBxkBPtCIQmiDNMet8wC/G2K4zDHf@public.gmane.org>
2010-10-01  6:48                       ` Felipe Balbi
2010-10-04  8:32                         ` Felipe Balbi
2010-10-01  6:00 ` [PATCH 1/3 v5] AM35x: Add musb support Felipe Balbi
     [not found]   ` <20101001060037.GC2925-UiBtZHVXSwEVvW8u9ZQWYwjfymiNCTlR@public.gmane.org>
2010-10-01  6:19     ` Gupta, Ajay Kumar
2010-10-04 17:28     ` Tony Lindgren
2010-10-05  5:41       ` Felipe Balbi
     [not found]         ` <20101005054111.GC2643-UiBtZHVXSwEVvW8u9ZQWYwjfymiNCTlR@public.gmane.org>
2010-10-05 18:34           ` Tony Lindgren

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).