diff options
Diffstat (limited to 'arch/mips/kernel/mips-cm.c')
-rw-r--r-- | arch/mips/kernel/mips-cm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/mips/kernel/mips-cm.c b/arch/mips/kernel/mips-cm.c index f76f7a08412d..85bbe9b96759 100644 --- a/arch/mips/kernel/mips-cm.c +++ b/arch/mips/kernel/mips-cm.c | |||
@@ -16,7 +16,7 @@ | |||
16 | void __iomem *mips_cm_base; | 16 | void __iomem *mips_cm_base; |
17 | void __iomem *mips_cm_l2sync_base; | 17 | void __iomem *mips_cm_l2sync_base; |
18 | 18 | ||
19 | phys_t __mips_cm_phys_base(void) | 19 | phys_addr_t __mips_cm_phys_base(void) |
20 | { | 20 | { |
21 | u32 config3 = read_c0_config3(); | 21 | u32 config3 = read_c0_config3(); |
22 | u32 cmgcr; | 22 | u32 cmgcr; |
@@ -30,10 +30,10 @@ phys_t __mips_cm_phys_base(void) | |||
30 | return (cmgcr & MIPS_CMGCRF_BASE) << (36 - 32); | 30 | return (cmgcr & MIPS_CMGCRF_BASE) << (36 - 32); |
31 | } | 31 | } |
32 | 32 | ||
33 | phys_t mips_cm_phys_base(void) | 33 | phys_addr_t mips_cm_phys_base(void) |
34 | __attribute__((weak, alias("__mips_cm_phys_base"))); | 34 | __attribute__((weak, alias("__mips_cm_phys_base"))); |
35 | 35 | ||
36 | phys_t __mips_cm_l2sync_phys_base(void) | 36 | phys_addr_t __mips_cm_l2sync_phys_base(void) |
37 | { | 37 | { |
38 | u32 base_reg; | 38 | u32 base_reg; |
39 | 39 | ||
@@ -49,13 +49,13 @@ phys_t __mips_cm_l2sync_phys_base(void) | |||
49 | return mips_cm_phys_base() + MIPS_CM_GCR_SIZE; | 49 | return mips_cm_phys_base() + MIPS_CM_GCR_SIZE; |
50 | } | 50 | } |
51 | 51 | ||
52 | phys_t mips_cm_l2sync_phys_base(void) | 52 | phys_addr_t mips_cm_l2sync_phys_base(void) |
53 | __attribute__((weak, alias("__mips_cm_l2sync_phys_base"))); | 53 | __attribute__((weak, alias("__mips_cm_l2sync_phys_base"))); |
54 | 54 | ||
55 | static void mips_cm_probe_l2sync(void) | 55 | static void mips_cm_probe_l2sync(void) |
56 | { | 56 | { |
57 | unsigned major_rev; | 57 | unsigned major_rev; |
58 | phys_t addr; | 58 | phys_addr_t addr; |
59 | 59 | ||
60 | /* L2-only sync was introduced with CM major revision 6 */ | 60 | /* L2-only sync was introduced with CM major revision 6 */ |
61 | major_rev = (read_gcr_rev() & CM_GCR_REV_MAJOR_MSK) >> | 61 | major_rev = (read_gcr_rev() & CM_GCR_REV_MAJOR_MSK) >> |
@@ -78,7 +78,7 @@ static void mips_cm_probe_l2sync(void) | |||
78 | 78 | ||
79 | int mips_cm_probe(void) | 79 | int mips_cm_probe(void) |
80 | { | 80 | { |
81 | phys_t addr; | 81 | phys_addr_t addr; |
82 | u32 base_reg; | 82 | u32 base_reg; |
83 | 83 | ||
84 | addr = mips_cm_phys_base(); | 84 | addr = mips_cm_phys_base(); |