diff options
| author | Haojian Zhuang <haojian.zhuang@linaro.org> | 2014-05-09 16:58:04 +0800 | 
|---|---|---|
| committer | Wei Xu <xuwei5@hisilicon.com> | 2014-09-03 14:10:26 +0100 | 
| commit | 2d518eda6361b38ba3f250c5f4fceefa9449490a (patch) | |
| tree | d80c813ad75ba0bfe4d5124e1d593685bb855dec /arch/arm/mach-hisi | |
| parent | 9cdc99919a95e8b54c1998b65bb1bfdabd47d27b (diff) | |
| download | linux-2d518eda6361b38ba3f250c5f4fceefa9449490a.tar.bz2 | |
ARM: hisi: enable HiP04
Support HiP04 SoC what supports 16 cores. And it relies on MCPM
framework.
Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
Signed-off-by: Wei Xu <xuwei5@hisilicon.com>
Diffstat (limited to 'arch/arm/mach-hisi')
| -rw-r--r-- | arch/arm/mach-hisi/Kconfig | 9 | ||||
| -rw-r--r-- | arch/arm/mach-hisi/hisilicon.c | 9 | 
2 files changed, 18 insertions, 0 deletions
| diff --git a/arch/arm/mach-hisi/Kconfig b/arch/arm/mach-hisi/Kconfig index 984882943f77..075772b34e80 100644 --- a/arch/arm/mach-hisi/Kconfig +++ b/arch/arm/mach-hisi/Kconfig @@ -22,6 +22,15 @@ config ARCH_HI3xxx  	help  	  Support for Hisilicon Hi36xx SoC family +config ARCH_HIP04 +	bool "Hisilicon HiP04 Cortex A15 family" if ARCH_MULTI_V7 +	select ARM_ERRATA_798181 if SMP +	select HAVE_ARM_ARCH_TIMER +	select MCPM if SMP +	select MCPM_QUAD_CLUSTER if SMP +	help +	  Support for Hisilicon HiP04 SoC family +  config ARCH_HIX5HD2  	bool "Hisilicon X5HD2 family" if ARCH_MULTI_V7  	select CACHE_L2X0 diff --git a/arch/arm/mach-hisi/hisilicon.c b/arch/arm/mach-hisi/hisilicon.c index 7cda6dda3cd0..7744c351bbfd 100644 --- a/arch/arm/mach-hisi/hisilicon.c +++ b/arch/arm/mach-hisi/hisilicon.c @@ -63,3 +63,12 @@ static const char *hix5hd2_compat[] __initconst = {  DT_MACHINE_START(HIX5HD2_DT, "Hisilicon HIX5HD2 (Flattened Device Tree)")  	.dt_compat	= hix5hd2_compat,  MACHINE_END + +static const char *hip04_compat[] __initconst = { +	"hisilicon,hip04-d01", +	NULL, +}; + +DT_MACHINE_START(HIP04, "Hisilicon HiP04 (Flattened Device Tree)") +	.dt_compat	= hip04_compat, +MACHINE_END |