diff options
| author | Tom Rini <trini@konsulko.com> | 2016-02-24 14:25:54 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-02-24 18:44:15 -0500 |
| commit | e1417c7b66f4e0051a3aa242f655e85c1c96eef2 (patch) | |
| tree | 2ce107939d41320686cd367bbf882ed53ef6e6c9 /board/freescale/ls1043aqds | |
| parent | 20434c8a0b9f6ff4a14d65fdb24c189f283412b2 (diff) | |
| parent | a08b1921b4a477abe1ac4482fae9ec4bcb3cd27e (diff) | |
| download | talos-obmc-uboot-e1417c7b66f4e0051a3aa242f655e85c1c96eef2.tar.gz talos-obmc-uboot-e1417c7b66f4e0051a3aa242f655e85c1c96eef2.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
Diffstat (limited to 'board/freescale/ls1043aqds')
| -rw-r--r-- | board/freescale/ls1043aqds/ls1043aqds.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/board/freescale/ls1043aqds/ls1043aqds.c b/board/freescale/ls1043aqds/ls1043aqds.c index 01db078222..a72fe52ea0 100644 --- a/board/freescale/ls1043aqds/ls1043aqds.c +++ b/board/freescale/ls1043aqds/ls1043aqds.c @@ -223,10 +223,25 @@ void board_retimer_init(void) int board_early_init_f(void) { +#ifdef CONFIG_HAS_FSL_XHCI_USB + struct ccsr_scfg *scfg = (struct ccsr_scfg *)CONFIG_SYS_FSL_SCFG_ADDR; + u32 usb_pwrfault; +#endif #ifdef CONFIG_LPUART u8 uart; #endif fsl_lsch2_early_init_f(); + +#ifdef CONFIG_HAS_FSL_XHCI_USB + out_be32(&scfg->rcwpmuxcr0, 0x3333); + out_be32(&scfg->usbdrvvbus_selcr, SCFG_USBDRVVBUS_SELCR_USB1); + usb_pwrfault = + (SCFG_USBPWRFAULT_SHARED << SCFG_USBPWRFAULT_USB3_SHIFT) | + (SCFG_USBPWRFAULT_SHARED << SCFG_USBPWRFAULT_USB2_SHIFT) | + (SCFG_USBPWRFAULT_SHARED << SCFG_USBPWRFAULT_USB1_SHIFT); + out_be32(&scfg->usbpwrfault_selcr, usb_pwrfault); +#endif + #ifdef CONFIG_LPUART /* We use lpuart0 as system console */ uart = QIXIS_READ(brdcfg[14]); |
