Merge branch 'master' of git://git.denx.de/u-boot-usb

Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
	arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h

diff --cc arch/arm/cpu/armv8/fsl-layerscape/cpu.c
Simple merge

diff --cc arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h
index 8d12d6cb93fa6137e9380e1000e52c69522907d8,9b60bd310a6ae8e4cf7205ca43a46fd64b4c5b99..3ad46eb37143983895330dbb16c7fc840e293369
--- 1/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h
--- 2/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h
@@@ -142,7 -139,7 +142,8 @@@
  /* Supplemental Configuration */
  #define SCFG_BASE             0x01fc0000
  #define SCFG_USB3PRM1CR                       0x000
+ #define SCFG_USB3PRM1CR_INIT          0x27672b2a
 +#define SCFG_QSPICLKCTLR      0x10
  
  #define TP_ITYP_AV            0x00000001      /* Initiator available */
  #define TP_ITYP_TYPE(x)       (((x) & 0x6) >> 1)      /* Initiator Type */

diff --cc board/freescale/ls2080aqds/ls2080aqds.c
Simple merge