> Currently, only USB Host 1 is supported. Hi,
this resembles mx28 USBH ... or am I wrong? Can't these be coalesced together? btw Fabio, do we support mx6q USB host in mainline Linux ? > > Cc: Remy Bohmer <li...@bohmer.net> > Signed-off-by: Wolfgang Grandegger <w...@denx.de> > --- > arch/arm/cpu/armv7/mx6/clock.c | 13 ++ > arch/arm/include/asm/arch-mx6/clock.h | 1 + > arch/arm/include/asm/arch-mx6/imx-regs.h | 3 + > drivers/usb/host/Makefile | 1 + > drivers/usb/host/ehci-mx6.c | 205 > ++++++++++++++++++++++++++++++ 5 files changed, 223 insertions(+), 0 > deletions(-) > create mode 100644 drivers/usb/host/ehci-mx6.c > > diff --git a/arch/arm/cpu/armv7/mx6/clock.c > b/arch/arm/cpu/armv7/mx6/clock.c index fa3a124..ef98563 100644 > --- a/arch/arm/cpu/armv7/mx6/clock.c > +++ b/arch/arm/cpu/armv7/mx6/clock.c > @@ -36,6 +36,19 @@ enum pll_clocks { > > struct imx_ccm_reg *imx_ccm = (struct imx_ccm_reg *)CCM_BASE_ADDR; > > +void enable_usboh3_clk(unsigned char enable) > +{ > + u32 reg; > + > + reg = __raw_readl(&imx_ccm->CCGR6); > + if (enable) > + reg |= MXC_CCM_CCGR_CG_MASK << MXC_CCM_CCGR0_CG0_OFFSET; > + else > + reg &= ~(MXC_CCM_CCGR_CG_MASK << MXC_CCM_CCGR0_CG0_OFFSET); > + __raw_writel(reg, &imx_ccm->CCGR6); > + > +} > + > static u32 decode_pll(enum pll_clocks pll, u32 infreq) > { > u32 div; > diff --git a/arch/arm/include/asm/arch-mx6/clock.h > b/arch/arm/include/asm/arch-mx6/clock.h index 636458f..613809b 100644 > --- a/arch/arm/include/asm/arch-mx6/clock.h > +++ b/arch/arm/include/asm/arch-mx6/clock.h > @@ -46,5 +46,6 @@ enum mxc_clock { > u32 imx_get_uartclk(void); > u32 imx_get_fecclk(void); > unsigned int mxc_get_clock(enum mxc_clock clk); > +void enable_usboh3_clk(unsigned char enable); > > #endif /* __ASM_ARCH_CLOCK_H */ > diff --git a/arch/arm/include/asm/arch-mx6/imx-regs.h > b/arch/arm/include/asm/arch-mx6/imx-regs.h index 3b5fd25..2bfe891 100644 > --- a/arch/arm/include/asm/arch-mx6/imx-regs.h > +++ b/arch/arm/include/asm/arch-mx6/imx-regs.h > @@ -111,6 +111,9 @@ > #define KPP_BASE_ADDR (AIPS1_OFF_BASE_ADDR + 0x38000) > #define WDOG1_BASE_ADDR (AIPS1_OFF_BASE_ADDR + 0x3C000) > #define WDOG2_BASE_ADDR (AIPS1_OFF_BASE_ADDR + 0x40000) > +#define ANATOP_BASE_ADDR (AIPS1_OFF_BASE_ADDR + 0x48000) > +#define USB_PHY0_BASE_ADDR (AIPS1_OFF_BASE_ADDR + 0x49000) > +#define USB_PHY1_BASE_ADDR (AIPS1_OFF_BASE_ADDR + 0x4a000) > #define CCM_BASE_ADDR (AIPS1_OFF_BASE_ADDR + 0x44000) > #define ANATOP_BASE_ADDR (AIPS1_OFF_BASE_ADDR + 0x48000) > #define SNVS_BASE_ADDR (AIPS1_OFF_BASE_ADDR + 0x4C000) > diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile > index 77e217f..1b62cc2 100644 > --- a/drivers/usb/host/Makefile > +++ b/drivers/usb/host/Makefile > @@ -43,6 +43,7 @@ endif > COBJS-$(CONFIG_USB_EHCI_MXC) += ehci-mxc.o > COBJS-$(CONFIG_USB_EHCI_MXS) += ehci-mxs.o > COBJS-$(CONFIG_USB_EHCI_MX5) += ehci-mx5.o > +COBJS-$(CONFIG_USB_EHCI_MX6) += ehci-mx6.o > COBJS-$(CONFIG_USB_EHCI_PPC4XX) += ehci-ppc4xx.o > COBJS-$(CONFIG_USB_EHCI_IXP4XX) += ehci-ixp.o > COBJS-$(CONFIG_USB_EHCI_KIRKWOOD) += ehci-kirkwood.o > diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c > new file mode 100644 > index 0000000..b7bf49d > --- /dev/null > +++ b/drivers/usb/host/ehci-mx6.c > @@ -0,0 +1,205 @@ > +/* > + * Copyright (c) 2009 Daniel Mack <dan...@caiaq.de> > + * Copyright (C) 2010 Freescale Semiconductor, Inc. > + * > + * 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. > + */ > + > +#include <common.h> > +#include <usb.h> > +#include <errno.h> > +#include <linux/compiler.h> > +#include <usb/ehci-fsl.h> > +#include <asm/io.h> > +#include <asm/arch/imx-regs.h> > +#include <asm/arch/clock.h> > +#include <asm/arch/mx6x_pins.h> > +#include <asm/arch/iomux-v3.h> > + > +#include "ehci.h" > +#include "ehci-core.h" > + > +#define USB_OTGREGS_OFFSET 0x000 > +#define USB_H1REGS_OFFSET 0x200 > +#define USB_H2REGS_OFFSET 0x400 > +#define USB_H3REGS_OFFSET 0x600 > +#define USB_OTHERREGS_OFFSET 0x800 > + > +#define USB_H1_CTRL_OFFSET 0x04 > + > +#define USBPHY_CTRL 0x00000030 > +#define USBPHY_CTRL_SET 0x00000034 > +#define USBPHY_CTRL_CLR 0x00000038 > +#define USBPHY_CTRL_TOG 0x0000003c > + > +#define USBPHY_PWD 0x00000000 > +#define USBPHY_CTRL_SFTRST 0x80000000 > +#define USBPHY_CTRL_CLKGATE 0x40000000 > +#define USBPHY_CTRL_ENUTMILEVEL3 0x00008000 > +#define USBPHY_CTRL_ENUTMILEVEL2 0x00004000 > + > +#define ANADIG_USB2_CHRG_DETECT 0x00000210 > +#define ANADIG_USB2_CHRG_DETECT_EN_B 0x00100000 > +#define ANADIG_USB2_CHRG_DETECT_CHK_CHRG_B 0x00080000 > + > +#define ANADIG_USB2_PLL_480_CTRL 0x00000020 > +#define ANADIG_USB2_PLL_480_CTRL_SET 0x00000024 > +#define ANADIG_USB2_PLL_480_CTRL_CLR 0x00000028 > +#define ANADIG_USB2_PLL_480_CTRL_BYPASS 0x00010000 > +#define ANADIG_USB2_PLL_480_CTRL_ENABLE 0x00002000 > +#define ANADIG_USB2_PLL_480_CTRL_POWER 0x00001000 > +#define ANADIG_USB2_PLL_480_CTRL_EN_USB_CLKS 0x00000040 > + > + > +#define UCTRL_OVER_CUR_POL (1 << 8) /* OTG Polarity of Overcurrent */ > +#define UCTRL_OVER_CUR_DIS (1 << 7) /* Disable OTG Overcurrent Detection > */ + > +/* USBCMD */ > +#define UH1_USBCMD_OFFSET 0x140 > +#define UCMD_RUN_STOP (1 << 0) /* controller run/stop */ > +#define UCMD_RESET (1 << 1) /* controller reset */ > + > +static void usbh1_internal_phy_clock_gate(int on) > +{ > + void __iomem *phy_reg = (void __iomem *)USB_PHY1_BASE_ADDR; > + > + phy_reg += on ? USBPHY_CTRL_CLR : USBPHY_CTRL_SET; > + __raw_writel(USBPHY_CTRL_CLKGATE, phy_reg); > +} > + > +static void usbh1_power_config(void) > +{ > + void __iomem *anatop_base = (void __iomem *)ANATOP_BASE_ADDR; > + > + /* > + * Some phy and power's special controls for host1 > + * 1. The external charger detector needs to be disabled > + * or the signal at DP will be poor > + * 2. The PLL's power and output to usb for host 1 > + * is totally controlled by IC, so the Software only needs > + * to enable them at initializtion. > + */ > + __raw_writel(ANADIG_USB2_CHRG_DETECT_EN_B | > + ANADIG_USB2_CHRG_DETECT_CHK_CHRG_B, > + anatop_base + ANADIG_USB2_CHRG_DETECT); > + > + __raw_writel(ANADIG_USB2_PLL_480_CTRL_BYPASS, > + anatop_base + ANADIG_USB2_PLL_480_CTRL_CLR); > + > + __raw_writel(ANADIG_USB2_PLL_480_CTRL_ENABLE | > + ANADIG_USB2_PLL_480_CTRL_POWER | > + ANADIG_USB2_PLL_480_CTRL_EN_USB_CLKS, > + anatop_base + ANADIG_USB2_PLL_480_CTRL_SET); This part looks mx28ish > +} > + > +static int usbh1_phy_enable(void) > +{ > + void __iomem *phy_reg = (void __iomem *)USB_PHY1_BASE_ADDR; > + void __iomem *phy_ctrl = (void __iomem *)(phy_reg + USBPHY_CTRL); > + void __iomem *usb_cmd = (void __iomem *)(USBOH3_USB_BASE_ADDR + > + USB_H1REGS_OFFSET + > + UH1_USBCMD_OFFSET); > + u32 val; > + > + /* Stop then Reset */ > + val = __raw_readl(usb_cmd); > + val &= ~UCMD_RUN_STOP; > + __raw_writel(val, usb_cmd); > + while (__raw_readl(usb_cmd) & UCMD_RUN_STOP) > + ; > + > + val = __raw_readl(usb_cmd); > + val |= UCMD_RESET; > + __raw_writel(val, usb_cmd); > + while (__raw_readl(usb_cmd) & UCMD_RESET) > + ; > + > + /* Reset USBPHY module */ > + val = __raw_readl(phy_ctrl); > + val |= USBPHY_CTRL_SFTRST; > + __raw_writel(val, phy_ctrl); > + udelay(10); This part too. > + > + /* Remove CLKGATE and SFTRST */ > + val = __raw_readl(phy_ctrl); > + val &= ~(USBPHY_CTRL_CLKGATE | USBPHY_CTRL_SFTRST); > + __raw_writel(val, phy_ctrl); > + udelay(10); This too, looks like mx28_reset_block(). But maybe I'm just paranoid and spooky here :) > + > + /* Power up the PHY */ > + __raw_writel(0, phy_reg + USBPHY_PWD); > + /* enable FS/LS device */ > + val = __raw_readl(phy_reg + USBPHY_CTRL); > + val |= (USBPHY_CTRL_ENUTMILEVEL2 | USBPHY_CTRL_ENUTMILEVEL3); > + __raw_writel(val, phy_reg + USBPHY_CTRL); And maybe not ... this looks like MX28 phy interface. M > + > + return 0; > +} > + > +static void usbh1_oc_config(void) > +{ > + void __iomem *usb_base = (void __iomem *)USBOH3_USB_BASE_ADDR; > + void __iomem *usbother_base = usb_base + USB_OTHERREGS_OFFSET; > + u32 val; > + > + val = __raw_readl(usbother_base + USB_H1_CTRL_OFFSET); > +#if CONFIG_MACH_TYPE == MACH_TYPE_MX6Q_ARM2 > + /* mx6qarm2 seems to required a different setting*/ > + val &= ~UCTRL_OVER_CUR_POL; > +#else > + val |= UCTRL_OVER_CUR_POL; > +#endif > + __raw_writel(val, usbother_base + USB_H1_CTRL_OFFSET); > + > + val = __raw_readl(usbother_base + USB_H1_CTRL_OFFSET); > + val |= UCTRL_OVER_CUR_DIS; > + __raw_writel(val, usbother_base + USB_H1_CTRL_OFFSET); > +} > + > +int ehci_hcd_init(void) > +{ > + struct usb_ehci *ehci; > + > + enable_usboh3_clk(1); > + mdelay(1); > + > + /* Do board specific initialization */ > + board_ehci_hcd_init(CONFIG_MXC_USB_PORT); > + > +#if CONFIG_MXC_USB_PORT == 1 > + /* USB Host 1 */ > + usbh1_power_config(); > + usbh1_oc_config(); > + usbh1_internal_phy_clock_gate(1); > + usbh1_phy_enable(); > +#else > +#error "MXC USB port not yet supported" > +#endif > + > + ehci = (struct usb_ehci *)(USBOH3_USB_BASE_ADDR + > + (0x200 * CONFIG_MXC_USB_PORT)); > + hccr = (struct ehci_hccr *)((uint32_t)&ehci->caplength); > + hcor = (struct ehci_hcor *)((uint32_t)hccr + > + HC_LENGTH(ehci_readl(&hccr->cr_capbase))); > + setbits_le32(&ehci->usbmode, CM_HOST); > + > + __raw_writel(CONFIG_MXC_USB_PORTSC, &ehci->portsc); > + setbits_le32(&ehci->portsc, USB_EN); > + > + mdelay(10); > + > + return 0; > +} > + > +int ehci_hcd_stop(void) > +{ > + return 0; > +} _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot