diff options
| author | Chris Zankel <chris@zankel.net> | 2015-04-14 03:51:35 (GMT) |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2015-04-14 03:51:35 (GMT) |
| commit | 7ead5b7e4a3cf4a16579a8f164022345b93fe972 (patch) | |
| tree | 0a9b9497f53d1593c9e2ac197b2e686ea74a9975 /arch/arm/mach-hisi/Kconfig | |
| parent | 834a316eeebcb75316c0a7d9088fa638c52dc584 (diff) | |
| parent | 39a8804455fb23f09157341d3ba7db6d7ae6ee76 (diff) | |
| download | linux-7ead5b7e4a3cf4a16579a8f164022345b93fe972.tar.xz | |
Merge tag 'v4.0' into for_next
Linux 4.0
Diffstat (limited to 'arch/arm/mach-hisi/Kconfig')
| -rw-r--r-- | arch/arm/mach-hisi/Kconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-hisi/Kconfig b/arch/arm/mach-hisi/Kconfig index cd19433..83061ad 100644 --- a/arch/arm/mach-hisi/Kconfig +++ b/arch/arm/mach-hisi/Kconfig @@ -22,6 +22,14 @@ config ARCH_HI3xxx help Support for Hisilicon Hi36xx SoC family +config ARCH_HIP01 + bool "Hisilicon HIP01 family" if ARCH_MULTI_V7 + select HAVE_ARM_SCU if SMP + select HAVE_ARM_TWD if SMP + select ARM_GLOBAL_TIMER + help + Support for Hisilicon HIP01 SoC family + config ARCH_HIP04 bool "Hisilicon HiP04 Cortex A15 family" if ARCH_MULTI_V7 select ARM_ERRATA_798181 if SMP |