diff options
author | Tom Rini <trini@konsulko.com> | 2015-07-20 17:12:52 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2015-07-20 17:12:52 -0400 |
commit | b217c89e8565ade3aaa9f74c33c93236bf151187 (patch) | |
tree | 878ccd12b9035fb6d2ccfda6d21ef3e1c85210f8 /include/fsl-mc/fsl_mc.h | |
parent | 73e1e7952a2a629dc071d894594df4852acc11ad (diff) | |
parent | db14f11dfe348550d8c10c6609277488d9f500d6 (diff) |
Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
Diffstat (limited to 'include/fsl-mc/fsl_mc.h')
-rw-r--r-- | include/fsl-mc/fsl_mc.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/fsl-mc/fsl_mc.h b/include/fsl-mc/fsl_mc.h index ec244150e8..9106f25f68 100644 --- a/include/fsl-mc/fsl_mc.h +++ b/include/fsl-mc/fsl_mc.h @@ -21,12 +21,9 @@ #define GCR1_M2_DE_RST BIT(14) #define GCR1_M_ALL_DE_RST (GCR1_M1_DE_RST | GCR1_M2_DE_RST) #define GSR_FS_MASK 0x3fffffff -#define MCFAPR_PL_MASK (0x1 << 18) -#define MCFAPR_BMT_MASK (0x1 << 17) -#define MCFAPR_BYPASS_ICID_MASK \ - (MCFAPR_PL_MASK | MCFAPR_BMT_MASK) #define SOC_MC_PORTALS_BASE_ADDR ((void __iomem *)0x00080C000000) +#define SOC_QBMAN_PORTALS_BASE_ADDR ((void __iomem *)0x000818000000) #define SOC_MC_PORTAL_STRIDE 0x10000 #define SOC_MC_PORTAL_ADDR(_portal_id) \ |