From 7dc2834fd57e12b355ee80ae5edf134af7476a3b Mon Sep 17 00:00:00 2001 From: Paul Burton Date: Wed, 15 Jan 2014 10:31:55 +0000 Subject: [PATCH] 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 Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/6363/ Signed-off-by: Ralf Baechle --- arch/mips/include/asm/mips-boards/malta.h | 5 +++++ arch/mips/mti-malta/malta-init.c | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/arch/mips/include/asm/mips-boards/malta.h b/arch/mips/include/asm/mips-boards/malta.h index 722bc889eab5..fd9774269a5e 100644 --- a/arch/mips/include/asm/mips-boards/malta.h +++ b/arch/mips/include/asm/mips-boards/malta.h @@ -63,6 +63,11 @@ static inline unsigned long get_msc_port_base(unsigned long reg) #define GIC_BASE_ADDR 0x1bdc0000 #define GIC_ADDRSPACE_SZ (128 * 1024) +/* + * CPC Specific definitions + */ +#define CPC_BASE_ADDR 0x1bde0000 + /* * MSC01 BIU Specific definitions * FIXME : These should be elsewhere ? 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 @@ #include #include #include +#include #include #include @@ -110,6 +111,11 @@ static void __init mips_ejtag_setup(void) flush_icache_range((unsigned long)base, (unsigned long)base + 0x80); } +phys_t mips_cpc_default_phys_base(void) +{ + return CPC_BASE_ADDR; +} + extern struct plat_smp_ops msmtc_smp_ops; void __init prom_init(void) @@ -277,6 +283,7 @@ mips_pci_controller: #endif /* Early detection of CMP support */ mips_cm_probe(); + mips_cpc_probe(); if (!register_cmp_smp_ops()) return; -- 2.20.1