From 43ebb405e5920dc905297255649ffed92496b421 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Thu, 5 May 2016 17:00:05 -0700 Subject: colibri_imx7: do not initialize second USB instance on i.MX 7Solo The i.MX 7Solo only has one USB controller. Do not enable USB_PEN but return a -ENODEV return code instead. This allows "usb start" to work properly on Colibri iMX7S modules. Signed-off-by: Stefan Agner Acked-by: Max Krummenacher --- board/toradex/colibri_imx7/colibri_imx7.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/board/toradex/colibri_imx7/colibri_imx7.c b/board/toradex/colibri_imx7/colibri_imx7.c index c46d57971b..b1c2cce935 100644 --- a/board/toradex/colibri_imx7/colibri_imx7.c +++ b/board/toradex/colibri_imx7/colibri_imx7.c @@ -633,6 +633,10 @@ int board_ehci_hcd_init(int port) #endif break; case 1: + /* i.MX 7Solo only has one USB instance... */ + if (is_cpu_type(MXC_CPU_MX7S)) + return -ENODEV; + imx_iomux_v3_setup_multiple_pads(usb_otg2_pads, ARRAY_SIZE(usb_otg2_pads)); gpio_direction_output(USBH_PWR , 1); -- cgit v1.2.3