diff options
| author | Ye.Li <B37916@freescale.com> | 2014-06-10 13:48:03 +0800 |
|---|---|---|
| committer | Ye.Li <B37916@freescale.com> | 2014-06-17 11:13:51 +0800 |
| commit | 923063a858b165060decea13b68737501a8cc98c (patch) | |
| tree | 16653a3e73e0457fc687fd0199067895857aba4d /include/configs | |
| parent | 124d8f3fd7b751e1f46775de277bcbd87d7945a1 (diff) | |
| download | u-boot-imx-923063a858b165060decea13b68737501a8cc98c.zip u-boot-imx-923063a858b165060decea13b68737501a8cc98c.tar.gz u-boot-imx-923063a858b165060decea13b68737501a8cc98c.tar.bz2 | |
ENGR00315894-45 ARM:imx6:sabreauto Add USB HOST BSP support
Sabreauto board has pin conflict (pin EIM_D18) between NOR flash
and i2c3. To enable the USB host, the i2c3 must be used to operate
the max7310 IO expander to output the VBUS power.
As SPINOR is enabled at default, it is impossible to use USB host
at same time. Thus, remove the SYS_USE_SPINOR from sabreauto
configurations to disable SPINOR.
Signed-off-by: Ye.Li <B37916@freescale.com>
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/mx6qsabreauto.h | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6qsabreauto.h index 5492366..133e218 100644 --- a/include/configs/mx6qsabreauto.h +++ b/include/configs/mx6qsabreauto.h @@ -14,22 +14,30 @@ #define CONFIG_CONSOLE_DEV "ttymxc3" #define CONFIG_MMCROOT "/dev/mmcblk0p2" +#define CONFIG_SYS_USE_NAND + +#include "mx6sabre_common.h" +#include <asm/imx-common/gpio.h> + +/*Since the pin conflicts on EIM D18, disable the USB host if the NOR flash is enabled */ +#if !defined(CONFIG_SYS_USE_SPINOR) && !defined(CONFIG_SYS_USE_EIMNOR) /* USB Configs */ #define CONFIG_CMD_USB #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_MX6 #define CONFIG_USB_STORAGE +#define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET /* For OTG port */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 - -#define CONFIG_SYS_USE_NAND - -#include "mx6sabre_common.h" -#include <asm/imx-common/gpio.h> +#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CONFIG_MXC_USB_FLAGS 0 +#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 /* Enabled USB controller number */ + +/* MAX7310 configs*/ +#define CONFIG_MAX7310_IOEXP +#define CONFIG_IOEXP_DEVICES_NUM 3 +#define CONFIG_IOEXP_DEV_PINS_NUM 8 +#endif #define CONFIG_SYS_FSL_USDHC_NUM 2 #define CONFIG_SYS_MMC_ENV_DEV 1 |