summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Gutierrez <juan.gutierrez@nxp.com>2016-10-27 16:29:48 -0500
committerJuan Gutierrez <juan.gutierrez@nxp.com>2016-11-30 13:12:55 -0600
commit4872d333a7e69cbfb10c3d9277f76e7572c924c1 (patch)
tree6c5dfaaba6827840ca68357037a9a98feeced1ed
parentf82bee6ab33c551f198d1619bfac35d5f97c7f42 (diff)
downloadu-boot-imx-4872d333a7e69cbfb10c3d9277f76e7572c924c1.zip
u-boot-imx-4872d333a7e69cbfb10c3d9277f76e7572c924c1.tar.gz
u-boot-imx-4872d333a7e69cbfb10c3d9277f76e7572c924c1.tar.bz2
MXSCM-212: mx6dqscm: usb: fix usb_otg_id iomux pad settings
USB_OTG_ID iomux pad was missconfigured and not selecting the GPIO1 Alternative for QWKS and the ENET_RX_ERR for EVB, as a consequence when connecting a USB device the PWR_EN was disabled. So usb function like "usb start" was not working as it should. Signed-off-by: Juan Gutierrez <juan.gutierrez@nxp.com>
-rw-r--r--board/freescale/mx6dqscm/mx6dqscm.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/board/freescale/mx6dqscm/mx6dqscm.c b/board/freescale/mx6dqscm/mx6dqscm.c
index a64e1c2..9a73a6a 100644
--- a/board/freescale/mx6dqscm/mx6dqscm.c
+++ b/board/freescale/mx6dqscm/mx6dqscm.c
@@ -611,7 +611,11 @@ int board_eth_init(bd_t *bis)
static iomux_v3_cfg_t const usb_otg_pads[] = {
MX6_PAD_EIM_D22__USB_OTG_PWR | MUX_PAD_CTRL(NO_PAD_CTRL),
+#ifdef CONFIG_SCMEVB
+ MX6_PAD_ENET_RX_ER__USB_OTG_ID | MUX_PAD_CTRL(OTG_ID_PAD_CTRL),
+#else
MX6_PAD_GPIO_1__USB_OTG_ID | MUX_PAD_CTRL(OTG_ID_PAD_CTRL),
+#endif
};
static iomux_v3_cfg_t const usb_hc1_pads[] = {
@@ -627,7 +631,11 @@ static void setup_usb(void)
* set daisy chain for otg_pin_id on 6q.
* for 6dl, this bit is reserved
*/
+#ifdef CONFIG_SCMEVB
+ imx_iomux_set_gpr_register(1, 13, 1, 0);
+#else
imx_iomux_set_gpr_register(1, 13, 1, 1);
+#endif
imx_iomux_v3_setup_multiple_pads(usb_hc1_pads,
ARRAY_SIZE(usb_hc1_pads));