diff options
author | Paul Burton <paul.burton@imgtec.com> | 2014-01-15 05:31:55 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2014-03-26 18:09:06 -0400 |
commit | 7dc2834fd57e12b355ee80ae5edf134af7476a3b (patch) | |
tree | 1638ba087ecd7c761b425cc60f67ca4b5a9acb6a /arch/mips/mti-malta | |
parent | 237036de6540a377268db5bb2b9c8efdccbe51c1 (diff) |
MIPS: Malta: Probe CPC when supported
When CPC support is compiled into the kernel (ie. CONFIG_MIPS_CPC=y),
probe the CPC on boot for Malta in order to allow any users of the CPC
to detect its presence & function correctly.
Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/6363/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/mti-malta')
-rw-r--r-- | arch/mips/mti-malta/malta-init.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/mips/mti-malta/malta-init.c b/arch/mips/mti-malta/malta-init.c index 85a62b036df0..1381365b8873 100644 --- a/arch/mips/mti-malta/malta-init.c +++ b/arch/mips/mti-malta/malta-init.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <asm/traps.h> | 21 | #include <asm/traps.h> |
22 | #include <asm/fw/fw.h> | 22 | #include <asm/fw/fw.h> |
23 | #include <asm/mips-cm.h> | 23 | #include <asm/mips-cm.h> |
24 | #include <asm/mips-cpc.h> | ||
24 | #include <asm/mips-boards/generic.h> | 25 | #include <asm/mips-boards/generic.h> |
25 | #include <asm/mips-boards/malta.h> | 26 | #include <asm/mips-boards/malta.h> |
26 | 27 | ||
@@ -110,6 +111,11 @@ static void __init mips_ejtag_setup(void) | |||
110 | flush_icache_range((unsigned long)base, (unsigned long)base + 0x80); | 111 | flush_icache_range((unsigned long)base, (unsigned long)base + 0x80); |
111 | } | 112 | } |
112 | 113 | ||
114 | phys_t mips_cpc_default_phys_base(void) | ||
115 | { | ||
116 | return CPC_BASE_ADDR; | ||
117 | } | ||
118 | |||
113 | extern struct plat_smp_ops msmtc_smp_ops; | 119 | extern struct plat_smp_ops msmtc_smp_ops; |
114 | 120 | ||
115 | void __init prom_init(void) | 121 | void __init prom_init(void) |
@@ -277,6 +283,7 @@ mips_pci_controller: | |||
277 | #endif | 283 | #endif |
278 | /* Early detection of CMP support */ | 284 | /* Early detection of CMP support */ |
279 | mips_cm_probe(); | 285 | mips_cm_probe(); |
286 | mips_cpc_probe(); | ||
280 | 287 | ||
281 | if (!register_cmp_smp_ops()) | 288 | if (!register_cmp_smp_ops()) |
282 | return; | 289 | return; |