[PATCH 0/3] ARM i.MX6: basic USB H1 support

[PATCH 0/3] ARM i.MX6: basic USB H1 support

[Steffen Trumtrar]

This series adds basic support for usb host1 on imx6q. This was tested on a
sabrelite board.

Steffen Trumtrar (3):
  ARM i.MX6: add the usbphy1 base addr
  ARM i.MX6: enable usbphy1
  usb: use ep-specific pwrgood delay

 arch/arm/mach-imx/Makefile                 |    2 +-
 arch/arm/mach-imx/include/mach/imx6-regs.h |    1 +
 arch/arm/mach-imx/usb-imx6.c               |  111 ++++++++++++++++++++++++++++
 drivers/usb/core/usb.c                     |    3 +-
 4 files changed, 115 insertions(+), 2 deletions(-)
 create mode 100644 arch/arm/mach-imx/usb-imx6.c

-- 
1.7.10.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 1/3] ARM i.MX6: add the usbphy1 base addr

[Steffen Trumtrar]

Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
---
 arch/arm/mach-imx/include/mach/imx6-regs.h |    1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/mach-imx/include/mach/imx6-regs.h b/arch/arm/mach-imx/include/mach/imx6-regs.h
index e62cc79..c7b7481 100644
--- a/arch/arm/mach-imx/include/mach/imx6-regs.h
+++ b/arch/arm/mach-imx/include/mach/imx6-regs.h
@@ -74,6 +74,7 @@
 #define MX6_WDOG2_BASE_ADDR             (MX6_AIPS1_OFF_BASE_ADDR + 0x40000)
 #define MX6_CCM_BASE_ADDR               (MX6_AIPS1_OFF_BASE_ADDR + 0x44000)
 #define MX6_ANATOP_BASE_ADDR            (MX6_AIPS1_OFF_BASE_ADDR + 0x48000)
+#define MX6_USBPHY1_BASE_ADDR		(MX6_AIPS1_OFF_BASE_ADDR + 0x4a000)
 #define MX6_SNVS_BASE_ADDR              (MX6_AIPS1_OFF_BASE_ADDR + 0x4C000)
 #define MX6_EPIT1_BASE_ADDR             (MX6_AIPS1_OFF_BASE_ADDR + 0x50000)
 #define MX6_EPIT2_BASE_ADDR             (MX6_AIPS1_OFF_BASE_ADDR + 0x54000)
-- 
1.7.10.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 2/3] ARM i.MX6: enable usbphy1

[Steffen Trumtrar]

Add a function to take the usbphy1 through its initialization procedure.
The imx6_usb_phy1_disable_oc function is needed at least on the sabrelite,
as the power design is faulty. The state on other imx6 boards is unknown,
therefore it is an extra function call at the moment.

Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
---
 arch/arm/mach-imx/Makefile   |    2 +-
 arch/arm/mach-imx/usb-imx6.c |  111 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 112 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/mach-imx/usb-imx6.c

diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
index 2ff537a..7b872f6 100644
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@ -8,7 +8,7 @@ obj-$(CONFIG_ARCH_IMX31) += speed-imx31.o imx31.o iomux-v2.o
 obj-$(CONFIG_ARCH_IMX35) += speed-imx35.o imx35.o iomux-v3.o
 obj-$(CONFIG_ARCH_IMX51) += speed-imx51.o imx51.o iomux-v3.o imx5.o
 obj-$(CONFIG_ARCH_IMX53) += speed-imx53.o imx53.o iomux-v3.o imx5.o
-obj-$(CONFIG_ARCH_IMX6) += speed-imx6.o imx6.o iomux-v3.o
+obj-$(CONFIG_ARCH_IMX6) += speed-imx6.o imx6.o iomux-v3.o usb-imx6.o
 obj-$(CONFIG_IMX_CLKO)	+= clko.o
 obj-$(CONFIG_IMX_IIM)	+= iim.o
 obj-$(CONFIG_NAND_IMX) += nand.o
diff --git a/arch/arm/mach-imx/usb-imx6.c b/arch/arm/mach-imx/usb-imx6.c
new file mode 100644
index 0000000..cd234d2
--- /dev/null
+++ b/arch/arm/mach-imx/usb-imx6.c
@@ -0,0 +1,111 @@
+/*
+ * Copyright (C) 2012 Steffen Trumtrar, Pengutronix
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation.
+ *
+ */
+
+#include <common.h>
+#include <io.h>
+#include <mach/imx6-regs.h>
+
+#define SET				0x4
+#define CLR				0x8
+
+#define USBPHY_CTRL			0x30
+#define USB_OTG_CTRL			0x800
+#define USB_UH1_CTRL			0x804
+#define USB_UH2_CTRL			0x808
+#define USB_UH3_CTRL			0x80c
+
+#define USB_UH1_USBCMD			0x340
+
+#define USB_CMD_RUNSTOP			(1 <<  0)
+#define USB_CMD_RESET			(1 <<  1)
+
+#define USB_OVER_CUR_DIS		(1 <<  7)
+#define USBPHY_CTRL_SFTRST		(1 << 31)
+#define USBPHY_CTRL_CLKGATE		(1 << 30)
+#define USBPHY_CTRL_ENUTMILEVEL3	(1 << 15)
+#define USBPHY_CTRL_ENUTMILEVEL2	(1 << 14)
+
+#define USBPHY1_PLL_480_CTRL_EN		(1 << 13)
+#define USBPHY1_PLL_480_CTRL_POWER	(1 << 12)
+#define USBPHY1_PLL_480_CTRL_EN_USB_CLK	(1 <<  6)
+#define USBPHY1_PLL_480_CTRL_BYPASS	(1 << 16)
+
+int imx6_usb_phy1_disable_oc(void)
+{
+	int val;
+
+	/* disable over current detection */
+	val = readl(MX6_USBOH3_USB_BASE_ADDR + USB_UH1_CTRL);
+	val |= USB_OVER_CUR_DIS;
+	writel(val, MX6_USBOH3_USB_BASE_ADDR + USB_UH1_CTRL);
+	val = readl(MX6_USBOH3_USB_BASE_ADDR + USB_UH2_CTRL);
+	val |= USB_OVER_CUR_DIS;
+	writel(val, MX6_USBOH3_USB_BASE_ADDR + USB_UH2_CTRL);
+	val = readl(MX6_USBOH3_USB_BASE_ADDR + USB_UH3_CTRL);
+	val |= USB_OVER_CUR_DIS;
+	writel(val, MX6_USBOH3_USB_BASE_ADDR + USB_UH3_CTRL);
+
+	return 0;
+}
+
+int imx6_usb_phy1_enable(void)
+{
+	int val;
+
+	/* disable external charger detector or DP will be poor */
+	writel(0x00180000, MX6_ANATOP_BASE_ADDR + 0x1b0);
+	writel(0x00180000, MX6_ANATOP_BASE_ADDR + 0x210);
+
+	/* enable usb pll */
+	writel(USBPHY1_PLL_480_CTRL_EN |
+	       USBPHY1_PLL_480_CTRL_POWER |
+	       USBPHY1_PLL_480_CTRL_EN_USB_CLK, MX6_ANATOP_BASE_ADDR + 0x24);
+
+	/* turn OFF clk bypass */
+	/* at least on imx6 v1.0 this essential for usb to work */
+	/* FIXME: test on v1.1. Datasheet declares bit as reserved */
+	writel(USBPHY1_PLL_480_CTRL_BYPASS, MX6_ANATOP_BASE_ADDR + 0x28);
+
+	/* stop then reset */
+	val = readl(MX6_USBOH3_USB_BASE_ADDR + USB_UH1_USBCMD);
+	val &= ~USB_CMD_RUNSTOP;
+	writel(val, MX6_USBOH3_USB_BASE_ADDR + USB_UH1_USBCMD);
+	while (readl(MX6_USBOH3_USB_BASE_ADDR + USB_UH1_USBCMD) & USB_CMD_RUNSTOP);
+
+	val = readl(MX6_USBOH3_USB_BASE_ADDR + USB_UH1_USBCMD);
+	val |= USB_CMD_RESET;
+	writel(val, MX6_USBOH3_USB_BASE_ADDR + USB_UH1_USBCMD);
+	while (readl(MX6_USBOH3_USB_BASE_ADDR + USB_UH1_USBCMD) & USB_CMD_RESET);
+
+	/* reset usbphy */
+	writel(USBPHY_CTRL_SFTRST, MX6_USBPHY1_BASE_ADDR + USBPHY_CTRL + SET);
+	udelay(10);
+	/* clr reset and clkgate */
+	writel(USBPHY_CTRL_SFTRST | USBPHY_CTRL_CLKGATE, MX6_USBPHY1_BASE_ADDR + USBPHY_CTRL + CLR);
+
+	/* clr all pwd bits => power up phy */
+	writel(0xffffffff, MX6_USBPHY1_BASE_ADDR + CLR);
+
+	/* set utmilvl2/3 */
+	val = readl(MX6_USBPHY1_BASE_ADDR + USBPHY_CTRL);
+	val |= USBPHY_CTRL_ENUTMILEVEL3 | USBPHY_CTRL_ENUTMILEVEL2;
+	writel(val, MX6_USBPHY1_BASE_ADDR + USBPHY_CTRL + SET);
+
+	return 0;
+}
-- 
1.7.10.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 3/3] usb: use ep-specific pwrgood delay

[Steffen Trumtrar]

In usb_hub_configure the hub is asked for its descriptor and among other things
its bPwrOn2PwrGood time. In the actual hub_power_on function this information
was not used and a hardcoded value was used instead. For some hubs this delay
is to short. So, use the delay the hub wants.

Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
---
 drivers/usb/core/usb.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index 81ae9f1..48bc121 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -948,7 +948,8 @@ static void usb_hub_power_on(struct usb_hub_device *hub)
 		usb_set_port_feature(dev, i + 1, USB_PORT_FEAT_POWER);
 		USB_HUB_PRINTF("port %d returns %lX\n", i + 1, dev->status);
 	}
-	mdelay(20);
+	/* power on is encoded in 2ms increments -> times 2 for the actual delay */
+	mdelay(hub->desc.bPwrOn2PwrGood*2);
 }
 
 #define MAX_TRIES 5
-- 
1.7.10.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 3/3] usb: use ep-specific pwrgood delay

[Eric Bénard]

Hi Steffen,

Le Thu, 30 Aug 2012 14:30:50 +0200,
Steffen Trumtrar <s.trumtrar@pengutronix.de> a écrit :

> In usb_hub_configure the hub is asked for its descriptor and among other things
> its bPwrOn2PwrGood time. In the actual hub_power_on function this information
> was not used and a hardcoded value was used instead. For some hubs this delay
> is to short. So, use the delay the hub wants.
> 
> Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
> Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
> ---
>  drivers/usb/core/usb.c |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
> index 81ae9f1..48bc121 100644
> --- a/drivers/usb/core/usb.c
> +++ b/drivers/usb/core/usb.c
> @@ -948,7 +948,8 @@ static void usb_hub_power_on(struct usb_hub_device *hub)
>  		usb_set_port_feature(dev, i + 1, USB_PORT_FEAT_POWER);
>  		USB_HUB_PRINTF("port %d returns %lX\n", i + 1, dev->status);
>  	}
> -	mdelay(20);
> +	/* power on is encoded in 2ms increments -> times 2 for the actual delay */
> +	mdelay(hub->desc.bPwrOn2PwrGood*2);
>  }
>  
>  #define MAX_TRIES 5

I tested you patch on my MX35 board and it doesn't work (the hub
requires 50 ms, the mdelay is thus 100 ms and in the end that's not
enough to see the USB mass storage connected to the hub) but
mdelay(hub->desc.bPwrOn2PwrGood*3) works fine.
Is it possible to increase this delay (*3 instead of *2) ?

Thanks
Eric

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 3/3] usb: use ep-specific pwrgood delay

[Steffen Trumtrar]

Hi Eric,

> Hi Steffen,
> 
> Le Thu, 30 Aug 2012 14:30:50 +0200,
> Steffen Trumtrar <s.trumtrar@pengutronix.de> a écrit :
> 
> > In usb_hub_configure the hub is asked for its descriptor and among other things
> > its bPwrOn2PwrGood time. In the actual hub_power_on function this information
> > was not used and a hardcoded value was used instead. For some hubs this delay
> > is to short. So, use the delay the hub wants.
> > 
> > Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
> > Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
> > ---
> >  drivers/usb/core/usb.c |    3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> > 
> > diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
> > index 81ae9f1..48bc121 100644
> > --- a/drivers/usb/core/usb.c
> > +++ b/drivers/usb/core/usb.c
> > @@ -948,7 +948,8 @@ static void usb_hub_power_on(struct usb_hub_device *hub)
> >  		usb_set_port_feature(dev, i + 1, USB_PORT_FEAT_POWER);
> >  		USB_HUB_PRINTF("port %d returns %lX\n", i + 1, dev->status);
> >  	}
> > -	mdelay(20);
> > +	/* power on is encoded in 2ms increments -> times 2 for the actual delay */
> > +	mdelay(hub->desc.bPwrOn2PwrGood*2);
> >  }
> >  
> >  #define MAX_TRIES 5
> 
> I tested you patch on my MX35 board and it doesn't work (the hub
> requires 50 ms, the mdelay is thus 100 ms and in the end that's not
> enough to see the USB mass storage connected to the hub) but
> mdelay(hub->desc.bPwrOn2PwrGood*3) works fine.
> Is it possible to increase this delay (*3 instead of *2) ?
> 
> Thanks
> Eric
> 

Where does your 50ms come from? From the debug messages of the usb-tool?
It has the same factor of times 2.
Have you tried hardcoding mdelay(100)?
I first thought about doing it the same way linux does it and use
max(pwrgood, 100). But 100ms minimum wouldn't help you either.
I don't really like the idea of just guessing a value. But if necessary,
I'm surely willing to change this patch.

Greetings
Steffen

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 3/3] usb: use ep-specific pwrgood delay

[Eric Bénard]

Hi Steffen,

Le Thu, 30 Aug 2012 15:26:31 +0200,
Steffen Trumtrar <s.trumtrar@pengutronix.de> a écrit :
> Where does your 50ms come from? From the debug messages of the usb-tool?
from a printf of bPwrOn2PwrGood

> It has the same factor of times 2.
yes, so in the end the hub is supposed to need 100ms to enable power.

> Have you tried hardcoding mdelay(100)?
yes -> doesn't work (see previous patch I sent 2 days ago on the same
subject).

> I first thought about doing it the same way linux does it and use
> max(pwrgood, 100). But 100ms minimum wouldn't help you either.
> I don't really like the idea of just guessing a value. But if necessary,
> I'm surely willing to change this patch.

with Linux's 100ms that works fine on the same board (under Linux). So
I'll check the if the mdelay(100) in barebox is really a 100ms timing
because the problem's root may be here !

Eric

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 3/3] usb: use ep-specific pwrgood delay

[Steffen Trumtrar]

Hi Eric,

>On Thu, Aug 30, 2012 at 03:59:32PM +0200, Eric Bénard wrote:
> Hi Steffen,
> 
> Le Thu, 30 Aug 2012 15:26:31 +0200,
> Steffen Trumtrar <s.trumtrar@pengutronix.de> a écrit :
> > Where does your 50ms come from? From the debug messages of the usb-tool?
> from a printf of bPwrOn2PwrGood
> 
> > It has the same factor of times 2.
> yes, so in the end the hub is supposed to need 100ms to enable power.

Okay. So you have an equal setting like me.

> 
> > Have you tried hardcoding mdelay(100)?
> yes -> doesn't work (see previous patch I sent 2 days ago on the same
> subject).

Ah, okay.

> > I first thought about doing it the same way linux does it and use
> > max(pwrgood, 100). But 100ms minimum wouldn't help you either.
> > I don't really like the idea of just guessing a value. But if necessary,
> > I'm surely willing to change this patch.
> 
> with Linux's 100ms that works fine on the same board (under Linux). So
> I'll check the if the mdelay(100) in barebox is really a 100ms timing
> because the problem's root may be here !

As both, barebox and linux, reset the hub and wait, it seems like the root
of the problem, yes.

Greetings
Steffen


-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 3/3] usb: use ep-specific pwrgood delay

[Eric Bénard]

Le Thu, 30 Aug 2012 16:12:27 +0200,
Steffen Trumtrar <s.trumtrar@pengutronix.de> a écrit :
> As both, barebox and linux, reset the hub and wait, it seems like the root
> of the problem, yes.
> 
unfortunatly, after a check with the oscilloscope the mdelay(100) is
really a 100 ms delay in barebox ... so the problem in barebox is
somewhere else.

Eric


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 0/3] ARM i.MX6: basic USB H1 support

[Sascha Hauer]

On Thu, Aug 30, 2012 at 02:30:47PM +0200, Steffen Trumtrar wrote:
> This series adds basic support for usb host1 on imx6q. This was tested on a
> sabrelite board.
> 
> Steffen Trumtrar (3):
>   ARM i.MX6: add the usbphy1 base addr
>   ARM i.MX6: enable usbphy1
>   usb: use ep-specific pwrgood delay

Applied, thanks.

I also applied 3/3 from which I know that it currently does not help
Eric. It's a step in the right direction and I hope that there might
be something else wrong on his hardware.

BTW, Eric, does the hub work under Linux? It also should not work there
when Linux also uses 100ms.

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 0/3] ARM i.MX6: basic USB H1 support

[Eric Bénard]

Le Fri, 31 Aug 2012 09:33:06 +0200,
Sascha Hauer <s.hauer@pengutronix.de> a écrit :
> I also applied 3/3 from which I know that it currently does not help
> Eric. It's a step in the right direction and I hope that there might
> be something else wrong on his hardware.
> 
> BTW, Eric, does the hub work under Linux? It also should not work there
> when Linux also uses 100ms.
> 
yes it works fine under Linux

Eric

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox