> -----Original Message----- > From: Zhao Qiang [mailto:qiang.z...@nxp.com] > Sent: Friday, January 29, 2016 12:28 PM > To: Mingkai Hu > Cc: tr...@konsulko.com; york sun; u-boot@lists.denx.de; Qiang Zhao > Subject: [PATCH v4 3/4] ls1043rdb: move USB mux config to > config_board_mux > > USB pins are muxed with other feature, move USB mux config to > config_board_mux. > > Signed-off-by: Zhao Qiang <qiang.z...@nxp.com> > --- > board/freescale/ls1043ardb/ls1043ardb.c | 30 +++++++++++++++------------ > --- > 1 file changed, 15 insertions(+), 15 deletions(-) > > diff --git a/board/freescale/ls1043ardb/ls1043ardb.c > b/board/freescale/ls1043ardb/ls1043ardb.c > index 834fdff..c2d4887 100644 > --- a/board/freescale/ls1043ardb/ls1043ardb.c > +++ b/board/freescale/ls1043ardb/ls1043ardb.c > @@ -75,23 +75,8 @@ int dram_init(void) > > int board_early_init_f(void) > { > - struct ccsr_scfg *scfg = (struct ccsr_scfg > *)CONFIG_SYS_FSL_SCFG_ADDR; > - u32 usb_pwrfault; > - > 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_DEDICATED << > - SCFG_USBPWRFAULT_USB3_SHIFT) | > - (SCFG_USBPWRFAULT_DEDICATED << > - SCFG_USBPWRFAULT_USB2_SHIFT) | > - (SCFG_USBPWRFAULT_SHARED << > - SCFG_USBPWRFAULT_USB1_SHIFT); > - out_be32(&scfg->usbpwrfault_selcr, usb_pwrfault); > -#endif > - > return 0; > } > > @@ -126,6 +111,21 @@ int board_init(void) > > int config_board_mux(void) > { > + struct ccsr_scfg *scfg = (struct ccsr_scfg > *)CONFIG_SYS_FSL_SCFG_ADDR; > + u32 usb_pwrfault; > + > +#ifdef CONFIG_HAS_FSL_XHCI_USB > + out_be32(&scfg->rcwpmuxcr0, 0x3333); > + out_be32(&scfg->usbdrvvbus_selcr, SCFG_USBDRVVBUS_SELCR_USB1); > + usb_pwrfault = (SCFG_USBPWRFAULT_DEDICATED << > + SCFG_USBPWRFAULT_USB3_SHIFT) | > + (SCFG_USBPWRFAULT_DEDICATED << > + SCFG_USBPWRFAULT_USB2_SHIFT) | > + (SCFG_USBPWRFAULT_SHARED << > + SCFG_USBPWRFAULT_USB1_SHIFT); > + out_be32(&scfg->usbpwrfault_selcr, usb_pwrfault); #endif > + > return 0; > } > > -- > 2.1.0.27.g96db324
Reviewed-by: Mingkai Hu <mingkai...@nxp.com> Regards, Mingkai _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
