projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next'
[platform/kernel/u-boot.git]
/
include
/
fsl-mc
/
fsl_mc.h
diff --git
a/include/fsl-mc/fsl_mc.h
b/include/fsl-mc/fsl_mc.h
index
c8f168a
..
ffe6da5
100644
(file)
--- a/
include/fsl-mc/fsl_mc.h
+++ b/
include/fsl-mc/fsl_mc.h
@@
-29,6
+29,9
@@
((void __iomem *)((uintptr_t)SOC_MC_PORTALS_BASE_ADDR + \
(_portal_id) * SOC_MC_PORTAL_STRIDE))
((void __iomem *)((uintptr_t)SOC_MC_PORTALS_BASE_ADDR + \
(_portal_id) * SOC_MC_PORTAL_STRIDE))
+#define MC_PORTAL_OFFSET_TO_PORTAL_ID(_portal_offset) \
+ ((_portal_offset) / SOC_MC_PORTAL_STRIDE)
+
struct mc_ccsr_registers {
u32 reg_gcr1;
u32 reserved1;
struct mc_ccsr_registers {
u32 reg_gcr1;
u32 reserved1;
@@
-57,5
+60,5
@@
int get_aiop_apply_status(void);
u64 mc_get_dram_addr(void);
unsigned long mc_get_dram_block_size(void);
int fsl_mc_ldpaa_init(bd_t *bis);
u64 mc_get_dram_addr(void);
unsigned long mc_get_dram_block_size(void);
int fsl_mc_ldpaa_init(bd_t *bis);
-
void fsl_mc_ldpaa_exit(bd_t *bis
);
+
int fsl_mc_ldpaa_exit(bd_t *bd
);
#endif
#endif