On 11/12/11 19:45, Jana Rapava wrote: > This commit adds USB support for EfikaMX and EfikaSB. > > Signed-off-by: Jana Rapava <ferma...@gmail.com> > Signed-off-by: Marek Vasut <marek.va...@gmail.com> > Cc: Remy Bohmer <li...@bohmer.net> > Cc: Stefano Babic <sba...@denx.de> > Cc: Igor Grinberg <grinb...@compulab.co.il> > Cc: Wolfgang Grandegger <w...@denx.de> > > Acked-by: Marek Vasut <marek.va...@gmail.com> > --- > Changes for v2: > - introduce temporary variable in ulpi_write > - whitespace changes > Changes for v3: > - add protection against multiple inclusion of efika.h > Changes for v4: > - rename multiple inclusion protection macro in efika.h > Changes for v5: > - fix unterminated #ifndef in efika.h > Changes for v6: > - add Acked-by > - no changes > Changes for v7: > - use ULPI-related definitions from ./include/usb/ulpi.h > Changes for v8: > - adjust to new and more generic ULPI implementation > > board/efikamx/Makefile | 3 + > board/efikamx/efika.h | 35 +++++ > board/efikamx/efikamx-usb.c | 344 > +++++++++++++++++++++++++++++++++++++++++++ > board/efikamx/efikamx.c | 3 + > include/configs/efikamx.h | 18 +++ > 5 files changed, 403 insertions(+), 0 deletions(-) > create mode 100644 board/efikamx/efika.h > create mode 100644 board/efikamx/efikamx-usb.c > > diff --git a/board/efikamx/Makefile b/board/efikamx/Makefile > index ee4a16e..860e4d2 100644 > --- a/board/efikamx/Makefile > +++ b/board/efikamx/Makefile > @@ -28,6 +28,9 @@ include $(TOPDIR)/config.mk > LIB = $(obj)lib$(BOARD).o > > COBJS := efikamx.o > +ifdef CONFIG_CMD_USB > +COBJS += efikamx-usb.o > +endif
Please, use the standard construct for such things: COBJS-$(CONFIG_CMD_USB) += efikamx-usb.o > > SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) > OBJS := $(addprefix $(obj),$(COBJS)) > diff --git a/board/efikamx/efika.h b/board/efikamx/efika.h > new file mode 100644 > index 0000000..fec9ee0 > --- /dev/null > +++ b/board/efikamx/efika.h > @@ -0,0 +1,35 @@ > +/* > + * Copyright (C) 2011 Jana Rapava <ferma...@gmail.com> > + * > + * See file CREDITS for list of people who contributed to this > + * project. > + * > + * This program is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License as > + * published by the Free Software Foundation; either version 2 of > + * the License, or (at your option) any later version. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * You should have received a copy of the GNU General Public License > + * along with this program; if not, write to the Free Software > + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, > + * MA 02111-1307 USA > + */ > + > +#ifndef __BOARD_EFIKAMX_EFIKA_H__ > +#define __BOARD_EFIKAMX_EFIKA_H__ > + > +/* > + * EHCI USB > + */ > +#ifdef CONFIG_CMD_USB > +void setup_iomux_usb(void); > +#else > +static inline void setup_iomux_usb(void) { } > +#endif > + > +#endif /* __BOARD_EFIKAMX_EFIKA_H__ */ > diff --git a/board/efikamx/efikamx-usb.c b/board/efikamx/efikamx-usb.c > new file mode 100644 > index 0000000..cbcdb18 > --- /dev/null > +++ b/board/efikamx/efikamx-usb.c > @@ -0,0 +1,344 @@ > +/* > + * Copyright (C) 2011 Marek Vasut <marek.va...@gmail.com> > + * Copyright (C) 2011 Jana Rapava <ferma...@gmail.com> > + * > + * See file CREDITS for list of people who contributed to this > + * project. > + * > + * This program is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License as > + * published by the Free Software Foundation; either version 2 of > + * the License, or (at your option) any later version. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * You should have received a copy of the GNU General Public License > + * along with this program; if not, write to the Free Software > + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, > + * MA 02111-1307 USA > + */ > + > +#include <common.h> > +#include <usb.h> > +#include <asm/io.h> > +#include <asm/arch/imx-regs.h> > +#include <asm/arch/mx5x_pins.h> > +#include <asm/arch/iomux.h> > +#include <asm/gpio.h> > +#include <usb/ehci-fsl.h> > +#include <errno.h> > +#include <watchdog.h> > + > +#include <usb/ehci.h> > +#include <usb/ehci-core.h> > +#include <usb/ulpi.h> > + > +/* > + * Configure the USB H1 and USB H2 IOMUX. > + */ > +#define USB_PAD_CONFIG (PAD_CTL_PKE_ENABLE | PAD_CTL_SRE_FAST | \ > + PAD_CTL_DRV_HIGH | PAD_CTL_100K_PU | \ > + PAD_CTL_HYS_ENABLE | PAD_CTL_PUE_PULL) > +void setup_iomux_usb(void) > +{ > + /* > + * Configure USBH1 pads > + */ > + mxc_request_iomux(MX51_PIN_USBH1_STP, IOMUX_CONFIG_ALT0); > + mxc_iomux_set_pad(MX51_PIN_USBH1_STP, USB_PAD_CONFIG); > + mxc_request_iomux(MX51_PIN_USBH1_CLK, IOMUX_CONFIG_ALT0); > + mxc_iomux_set_pad(MX51_PIN_USBH1_CLK, USB_PAD_CONFIG); > + mxc_request_iomux(MX51_PIN_USBH1_DIR, IOMUX_CONFIG_ALT0); > + mxc_iomux_set_pad(MX51_PIN_USBH1_DIR, USB_PAD_CONFIG); > + mxc_request_iomux(MX51_PIN_USBH1_NXT, IOMUX_CONFIG_ALT0); > + mxc_iomux_set_pad(MX51_PIN_USBH1_NXT, USB_PAD_CONFIG); > + > + mxc_request_iomux(MX51_PIN_USBH1_DATA0, IOMUX_CONFIG_ALT0); > + mxc_iomux_set_pad(MX51_PIN_USBH1_DATA0, USB_PAD_CONFIG); > + mxc_request_iomux(MX51_PIN_USBH1_DATA1, IOMUX_CONFIG_ALT0); > + mxc_iomux_set_pad(MX51_PIN_USBH1_DATA1, USB_PAD_CONFIG); > + mxc_request_iomux(MX51_PIN_USBH1_DATA2, IOMUX_CONFIG_ALT0); > + mxc_iomux_set_pad(MX51_PIN_USBH1_DATA2, USB_PAD_CONFIG); > + mxc_request_iomux(MX51_PIN_USBH1_DATA3, IOMUX_CONFIG_ALT0); > + mxc_iomux_set_pad(MX51_PIN_USBH1_DATA3, USB_PAD_CONFIG); > + mxc_request_iomux(MX51_PIN_USBH1_DATA4, IOMUX_CONFIG_ALT0); > + mxc_iomux_set_pad(MX51_PIN_USBH1_DATA4, USB_PAD_CONFIG); > + mxc_request_iomux(MX51_PIN_USBH1_DATA5, IOMUX_CONFIG_ALT0); > + mxc_iomux_set_pad(MX51_PIN_USBH1_DATA5, USB_PAD_CONFIG); > + mxc_request_iomux(MX51_PIN_USBH1_DATA6, IOMUX_CONFIG_ALT0); > + mxc_iomux_set_pad(MX51_PIN_USBH1_DATA6, USB_PAD_CONFIG); > + mxc_request_iomux(MX51_PIN_USBH1_DATA7, IOMUX_CONFIG_ALT0); > + mxc_iomux_set_pad(MX51_PIN_USBH1_DATA7, USB_PAD_CONFIG); > + > + /* > + * Configure USBH1 control pads > + */ > + > + /* USB PHY reset */ > + mxc_request_iomux(MX51_PIN_EIM_D27, IOMUX_CONFIG_ALT1); > + mxc_iomux_set_pad(MX51_PIN_EIM_D27, PAD_CTL_PKE_ENABLE | > + PAD_CTL_SRE_FAST | PAD_CTL_DRV_HIGH); > + > + /* USB HUB reset */ > + mxc_request_iomux(MX51_PIN_GPIO1_5, IOMUX_CONFIG_ALT0); > + mxc_iomux_set_pad(MX51_PIN_GPIO1_5, PAD_CTL_PKE_ENABLE | > + PAD_CTL_SRE_FAST | PAD_CTL_DRV_HIGH); > + > + > + if (machine_is_efikasb()) { > + /* > + * Configure USBH2 pads (used on EfikaSB) > + */ > + /* USBH2_DATA */ > + mxc_request_iomux(MX51_PIN_EIM_D16, IOMUX_CONFIG_ALT2); > + mxc_iomux_set_pad(MX51_PIN_EIM_D16, USB_PAD_CONFIG); > + mxc_request_iomux(MX51_PIN_EIM_D17, IOMUX_CONFIG_ALT2); > + mxc_iomux_set_pad(MX51_PIN_EIM_D17, USB_PAD_CONFIG); > + mxc_request_iomux(MX51_PIN_EIM_D18, IOMUX_CONFIG_ALT2); > + mxc_iomux_set_pad(MX51_PIN_EIM_D18, USB_PAD_CONFIG); > + mxc_request_iomux(MX51_PIN_EIM_D19, IOMUX_CONFIG_ALT2); > + mxc_iomux_set_pad(MX51_PIN_EIM_D19, USB_PAD_CONFIG); > + mxc_request_iomux(MX51_PIN_EIM_D20, IOMUX_CONFIG_ALT2); > + mxc_iomux_set_pad(MX51_PIN_EIM_D20, USB_PAD_CONFIG); > + mxc_request_iomux(MX51_PIN_EIM_D21, IOMUX_CONFIG_ALT2); > + mxc_iomux_set_pad(MX51_PIN_EIM_D21, USB_PAD_CONFIG); > + mxc_request_iomux(MX51_PIN_EIM_D22, IOMUX_CONFIG_ALT2); > + mxc_iomux_set_pad(MX51_PIN_EIM_D22, USB_PAD_CONFIG); > + mxc_request_iomux(MX51_PIN_EIM_D23, IOMUX_CONFIG_ALT2); > + mxc_iomux_set_pad(MX51_PIN_EIM_D23, USB_PAD_CONFIG); > + > + /* USBH2_CLK */ > + mxc_request_iomux(MX51_PIN_EIM_A24, IOMUX_CONFIG_ALT2); > + mxc_iomux_set_pad(MX51_PIN_EIM_A24, USB_PAD_CONFIG); > + /* USBH2_DIR */ > + mxc_request_iomux(MX51_PIN_EIM_A25, IOMUX_CONFIG_ALT2); > + mxc_iomux_set_pad(MX51_PIN_EIM_A25, USB_PAD_CONFIG); > + /* USBH2_STP */ > + mxc_request_iomux(MX51_PIN_EIM_A26, IOMUX_CONFIG_ALT2); > + mxc_iomux_set_pad(MX51_PIN_EIM_A26, USB_PAD_CONFIG); > + /* USBH2_NXT */ > + mxc_request_iomux(MX51_PIN_EIM_A27, IOMUX_CONFIG_ALT2); > + mxc_iomux_set_pad(MX51_PIN_EIM_A27, USB_PAD_CONFIG); > + } > + > + /* WIFI EN (act low) */ > + mxc_request_iomux(MX51_PIN_EIM_A22, IOMUX_CONFIG_GPIO); > + mxc_iomux_set_pad(MX51_PIN_EIM_A22, 0); > + /* WIFI RESET */ > + mxc_request_iomux(MX51_PIN_EIM_A16, IOMUX_CONFIG_GPIO); > + mxc_iomux_set_pad(MX51_PIN_EIM_A16, 0); > + /* BT EN (act low) */ > + mxc_request_iomux(MX51_PIN_EIM_A17, IOMUX_CONFIG_GPIO); > + mxc_iomux_set_pad(MX51_PIN_EIM_A17, 0); > +} > + > +/* > + * Enable devices connected to USB buses. > + */ > +void efika_usb_enable_devices(void) > +{ > + /* Enable Bluetooth */ > + gpio_direction_output(IOMUX_TO_GPIO(MX51_PIN_EIM_A17), 0); > + udelay(10000); > + gpio_set_value(IOMUX_TO_GPIO(MX51_PIN_EIM_A17), 1); > + > + /* Enable WiFi */ > + gpio_direction_output(IOMUX_TO_GPIO(MX51_PIN_EIM_A22), 1); > + udelay(10000); > + > + /* Reset the WiFi chip */ > + gpio_direction_output(IOMUX_TO_GPIO(MX51_PIN_EIM_A16), 0); > + udelay(10000); > + gpio_set_value(IOMUX_TO_GPIO(MX51_PIN_EIM_A16), 1); > +} > + > +/* > + * Reset USB HUB (or HUBs on EfikaSB). > + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. > + */ > +void efika_usb_hub_reset(void) > +{ > + /* HUB reset */ > + gpio_direction_output(IOMUX_TO_GPIO(MX51_PIN_GPIO1_5), 1); > + udelay(1000); > + gpio_set_value(IOMUX_TO_GPIO(MX51_PIN_GPIO1_5), 0); > + udelay(1000); > + gpio_set_value(IOMUX_TO_GPIO(MX51_PIN_GPIO1_5), 1); > +} > + > +/* > + * Reset USB PHY (or PHYs on EfikaSB). > + */ > +void efika_usb_phy_reset(void) > +{ > + /* SMSC 3317 PHY reset */ > + gpio_direction_output(IOMUX_TO_GPIO(MX51_PIN_EIM_D27), 0); > + udelay(1000); > + gpio_set_value(IOMUX_TO_GPIO(MX51_PIN_EIM_D27), 1); > +} > + > +/* > + * Configure control registers of the USB controller. > + */ > +void control_regs_setup(struct mx5_usb_control_regs *control) > +{ > + clrsetbits_le32(&control->usbctrl, > + (MXC_OTG_WUE | MXC_OTG_PM | MX51_H1_ULPI_IE | MX51_H1_WUE), > + MX51_H1_PM); > + > + clrsetbits_le32(&control->phyctrl0, > + MX51_OTG_OVERCURD, > + MX51_EHCI_POWERPINSE); > + > + clrsetbits_le32(&control->phyctrl1, > + MX51_SYSCLOCK_MASK, > + MX51_SYSCLOCK_24_MHZ); > + > + setbits_le32(&control->usbctrl1, MX51_H1_EXTCLKE); > + > + clrsetbits_le32(&control->uh2ctrl, > + (MX51_H2_ULPI_IE | MX51_H2_WUE), > + MX51_H2_PM); > + > + udelay(10000); > +} Is this function also board specific? > + > +void ulpi_set_flags(u32 ulpi_viewport, struct ulpi_regs *ulpi) > +{ > + ulpi_otg_ctrl_flags(ulpi_viewport, ulpi, ULPI_WRITE, > ULPI_OTG_EXTVBUSIND | > + ULPI_OTG_DM_PULLDOWN | ULPI_OTG_DP_PULLDOWN); > + ulpi_function_ctrl_flags(ulpi_viewport, ulpi, ULPI_WRITE, > ULPI_FC_XCVRSEL | > + ULPI_FC_OPMODE_NORMAL | ULPI_FC_SUSPENDM); > + ulpi_iface_ctrl_flags(ulpi_viewport, ulpi, ULPI_WRITE, 0); > + > + /* > + * NOTE: Setting ULPI_OTG_CHRGVBUS violates USB specification, > + * but otherwise, USB on Efika doesn't charge VBUS > + * and as a result, USB doesn't work. > + */ > + ulpi_otg_ctrl_flags(ulpi_viewport, ulpi, ULPI_SET, ULPI_OTG_DRVVBUS | > + ULPI_OTG_DRVVBUS_EXT | ULPI_OTG_CHRGVBUS); > +} > + > +/* > + * Solve the VBUS reset problem on Efika > + * by setting the CHRG_VBUS bit in the reset. > + */ > +void ehci_fixup(uint32_t *status_reg, uint32_t *reg_ref) > +{ > + struct usb_ehci *ehci = (struct usb_ehci *)(OTG_BASE_ADDR + > + MX51_REGISTER_LAYOUT_LENGTH); > + struct ulpi_regs *ulpi = (struct ulpi_regs *)0; > + > + u32 tmp = ulpi_read((u32)&ehci->ulpi_viewport, (u32)&ulpi->otg_ctrl); > + tmp |= ULPI_OTG_CHRGVBUS; > + ulpi_write((u32)&ehci->ulpi_viewport, (u32)&ulpi->otg_ctrl, tmp); > + > + /* USB 2.0 specification say 50 ms resets on root. */ > + wait_ms(50); > + > + /* Now terminate the reset. */ > + *reg_ref = ehci_readl(status_reg); > + *reg_ref |= EHCI_PS_PE; > +} > + > +void ehci0_init(struct usb_ehci *ehci) > +{ > + writel(MX51_16BIT_UTMI, &ehci->portsc); > +} > + > +void ehci1_init(struct usb_ehci *ehci, struct ulpi_regs *ulpi) > +{ > + mxc_request_iomux(MX51_PIN_USBH1_STP, IOMUX_CONFIG_ALT2); > + mxc_iomux_set_pad(MX51_PIN_USBH1_STP, PAD_CTL_DRV_HIGH | > + PAD_CTL_PKE_ENABLE | PAD_CTL_SRE_FAST); > + gpio_direction_output(IOMUX_TO_GPIO(MX51_PIN_USBH1_STP), 0); > + udelay(1000); > + gpio_set_value(IOMUX_TO_GPIO(MX51_PIN_USBH1_STP), 1); > + udelay(1000); > + > + mxc_request_iomux(MX51_PIN_USBH1_STP, IOMUX_CONFIG_ALT0); > + mxc_iomux_set_pad(MX51_PIN_USBH1_STP, USB_PAD_CONFIG); > + udelay(10000); > + > + clrbits_le32(&ehci->usbcmd, MX51_ITC_IMMEDIATE_MASK); > + udelay(10000); > + > + writel(MX51_ULPI_MODE_MASK, &ehci->portsc); > + udelay(10000); > + > + ulpi_init((u32)&ehci->ulpi_viewport, ulpi); > + ulpi_set_flags((u32)&ehci->ulpi_viewport, ulpi); > +} > + > +void ehci2_init(struct usb_ehci *ehci, struct ulpi_regs *ulpi) > +{ > + mxc_request_iomux(MX51_PIN_EIM_A26, IOMUX_CONFIG_ALT1); > + mxc_iomux_set_pad(MX51_PIN_EIM_A26, PAD_CTL_DRV_HIGH | > + PAD_CTL_PKE_ENABLE | PAD_CTL_SRE_FAST); > + gpio_direction_output(IOMUX_TO_GPIO(MX51_PIN_EIM_A26), 0); > + udelay(1000); > + gpio_set_value(IOMUX_TO_GPIO(MX51_PIN_EIM_A26), 1); > + udelay(1000); > + > + mxc_request_iomux(MX51_PIN_EIM_A26, IOMUX_CONFIG_ALT2); > + mxc_iomux_set_pad(MX51_PIN_EIM_A26, USB_PAD_CONFIG); > + > + writel(MX51_ULPI_MODE_MASK, &ehci->portsc); > + udelay(10000); > + > + ulpi_init((u32)&ehci->ulpi_viewport, ulpi); > + ulpi_set_flags((u32)&ehci->ulpi_viewport, ulpi); > +} The above two functions (ehcix_init()) look very similar, can't those be consolidated? > + > +int ehci_hcd_init(void) > +{ > + struct usb_ehci *ehci; > + struct mx5_usb_control_regs *mx5_usb_control_regs; > + struct ulpi_regs *ulpi; > + > + mx5_usb_control_regs = (struct mx5_usb_control_regs *)(OTG_BASE_ADDR + > + MX5_CTRL_REGS_OFFSET); > + control_regs_setup(mx5_usb_control_regs); > + ulpi = (struct ulpi_regs *)0; > + > + /* Init EHCI core */ > + ehci = (struct usb_ehci *)(OTG_BASE_ADDR + > + (MX51_REGISTER_LAYOUT_LENGTH * 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); > + setbits_le32(&ehci->control, USB_EN); > + > + /* Init iMX51 EHCI */ > + efika_usb_phy_reset(); > + efika_usb_hub_reset(); > + efika_usb_enable_devices(); > + > + switch (CONFIG_MXC_USB_PORT) { > + case 0: > + ehci0_init(ehci); > + break; > + case 1: > + ehci1_init(ehci, ulpi); > + break; > + case 2: > + if (machine_is_efikasb()) > + ehci2_init(ehci, ulpi); > + break; > + }; > + > + /* EfikaMX USB has issues ... */ > + udelay(10000); > + > + return 0; > +} This function mixes board specific with SoC specific initializations. > + > +int ehci_hcd_stop(void) > +{ > + return 0; > +} Don't you want to do anything here? I don't mind, but... > diff --git a/board/efikamx/efikamx.c b/board/efikamx/efikamx.c > index 0c4e24b..8e9b42b 100644 > --- a/board/efikamx/efikamx.c > +++ b/board/efikamx/efikamx.c > @@ -37,6 +37,8 @@ > #include <fsl_pmic.h> > #include <mc13892.h> > > +#include "efika.h" > + > DECLARE_GLOBAL_DATA_PTR; > > /* > @@ -678,6 +680,7 @@ int board_late_init(void) > > setup_iomux_led(); > setup_iomux_ata(); > + setup_iomux_usb(); > > efikamx_toggle_led(EFIKAMX_LED_BLUE); > > diff --git a/include/configs/efikamx.h b/include/configs/efikamx.h > index 54f48e4..1c48376 100644 > --- a/include/configs/efikamx.h > +++ b/include/configs/efikamx.h > @@ -44,6 +44,10 @@ > > #define CONFIG_SYS_TEXT_BASE 0x97800000 > > +#define CONFIG_L2_OFF > +#define CONFIG_SYS_ICACHE_OFF > +#define CONFIG_SYS_DCACHE_OFF > + > /* > * Bootloader Components Configuration > */ > @@ -172,6 +176,20 @@ > #endif > > /* > + * USB > + */ > +#define CONFIG_CMD_USB > +#ifdef CONFIG_CMD_USB > +#define CONFIG_USB_EHCI /* Enable EHCI USB support */ > +#define CONFIG_MXC_USB_PORT 1 > +#define CONFIG_EHCI_IS_TDI > +#define CONFIG_USB_STORAGE > +#define CONFIG_USB_KEYBOARD > +#define CONFIG_USB_ULPI > +#define CONFIG_USB_ULPI_VIEWPORT I think it will be useful to have CONFIG_USB_ULPI_TIMEOUT option, so boards can easily override the default. > +#endif /* CONFIG_CMD_USB */ > + > +/* > * Filesystems > */ > #ifdef CONFIG_CMD_FAT -- Regards, Igor. _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot