From: Tom Rini Date: Sun, 19 Jun 2016 03:46:21 +0000 (-0400) Subject: Merge branch 'master' of git://git.denx.de/u-boot-usb X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=a10a31ec91ad2ee514a42baea9314553aa972676;p=u-boot.git Merge branch 'master' of git://git.denx.de/u-boot-usb Signed-off-by: Tom Rini Conflicts: arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h --- a10a31ec91ad2ee514a42baea9314553aa972676 diff --cc arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h index 8d12d6cb93,9b60bd310a..3ad46eb371 --- a/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 */