diff options
author | Tom Rini <trini@konsulko.com> | 2016-06-18 23:46:21 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-06-18 23:46:21 -0400 |
commit | a10a31ec91ad2ee514a42baea9314553aa972676 (patch) | |
tree | 4fa6eff1efde896343c455854b5c78b2b91bd9e9 /arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h | |
parent | 2372b0012925f9100980151f4a28347c82feaba8 (diff) | |
parent | 1e6fb0e367564d427d7c57fa7b3b972ecb7147a3 (diff) | |
download | u-boot-imx-a10a31ec91ad2ee514a42baea9314553aa972676.zip u-boot-imx-a10a31ec91ad2ee514a42baea9314553aa972676.tar.gz u-boot-imx-a10a31ec91ad2ee514a42baea9314553aa972676.tar.bz2 |
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
Diffstat (limited to 'arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h')
-rw-r--r-- | arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h index 8d12d6c..3ad46eb 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h @@ -142,6 +142,7 @@ /* 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 */ @@ -323,4 +324,7 @@ struct ccsr_reset { u32 ip_rev1; /* 0xbf8 */ u32 ip_rev2; /* 0xbfc */ }; + +uint get_svr(void); + #endif /* __ARCH_FSL_LSCH3_IMMAP_H_ */ |