On 08/30/15 15:36, Nikita Kiryanov wrote:

On some CM-FX6 modules U-Boot attempts to configure the usb0 controller in device mode, which renders it unavailable: USB0: Port not available. and also causes usb stop to report an error EHCI failed to shut down host controller.

This happens mostly on MX6 Dual based modules, and is caused by the USBPHY_CTRL register reporting USBPHY_CTRL_OTG_ID to be 1, even when it is pulled down. Since we do not support device mode in cm-fx6 u-boot, force all controllers to be configured as hosts.

Cc: Stefano Babic sbabic@denx.de Cc: Igor Grinberg grinberg@compulab.co.il Signed-off-by: Nikita Kiryanov nikita@compulab.co.il

Acked-by: Igor Grinberg grinberg@compulab.co.il

---

board/compulab/cm_fx6/cm_fx6.c | 6 ++++++ 1 file changed, 6 insertions(+)

diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c index def821c..668d221 100644 --- a/board/compulab/cm_fx6/cm_fx6.c +++ b/board/compulab/cm_fx6/cm_fx6.c @@ -14,6 +14,7 @@ #include <miiphy.h> #include <netdev.h> #include <errno.h> +#include <usb.h> #include <fdt_support.h> #include <sata.h> #include <splash.h> @@ -349,6 +350,11 @@ static int cm_fx6_setup_usb_otg(void) return gpio_direction_output(SB_FX6_USB_OTG_PWR, 0); }

+int board_usb_phy_mode(int port) +{

• return USB_INIT_HOST;

+}

int board_ehci_hcd_init(int port) { int ret;

On 08/30/15 15:36, Nikita Kiryanov wrote:

Print board revision for cm-fx6.

Cc: Stefano Babic sbabic@denx.de Cc: Igor Grinberg grinberg@compulab.co.il Signed-off-by: Nikita Kiryanov nikita@compulab.co.il

Acked-by: Igor Grinberg grinberg@compulab.co.il

---

board/compulab/cm_fx6/cm_fx6.c | 7 +++++++ include/configs/cm_fx6.h | 1 + 2 files changed, 8 insertions(+)

diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c index 668d221..3ad1216 100644 --- a/board/compulab/cm_fx6/cm_fx6.c +++ b/board/compulab/cm_fx6/cm_fx6.c @@ -645,6 +645,13 @@ int checkboard(void) return 0; }

+int misc_init_r(void) +{

• cl_print_pcb_info();
• return 0;

+}

void dram_init_banksize(void) { gd->bd->bi_dram[0].start = PHYS_SDRAM_1; diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index ddf6b5f..12734a1 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -224,6 +224,7 @@ #define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024) #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 800 /* 400 KB */ #define CONFIG_OF_BOARD_SETUP +#define CONFIG_MISC_INIT_R

/* SPL */ #include "imx6_spl.h"

On 08/30/15 15:36, Nikita Kiryanov wrote:

CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE works better than CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP (keyboards that previously didn't work such as Microsoft Comfort Curve 1000 now do work, and it's also faster).

Switch to CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE.

Cc: Stefano Babic sbabic@denx.de Cc: Igor Grinberg grinberg@compulab.co.il Signed-off-by: Nikita Kiryanov nikita@compulab.co.il

Acked-by: Igor Grinberg grinberg@compulab.co.il

---

configs/cm_fx6_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig index 21c35e3..314eb1c 100644 --- a/configs/cm_fx6_defconfig +++ b/configs/cm_fx6_defconfig @@ -28,5 +28,5 @@ CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y -CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y +CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y CONFIG_SYS_PROMPT="CM-FX6 # "