@ -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 ;
}