diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-04-26 13:02:24 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-04-26 13:02:24 +0200 |
| commit | 8f8aab65459e46f3300f66335b6d001389883597 (patch) | |
| tree | d5fbf203e9cf63803a7fe3467ec39bdf81cfa279 /arch/arm64/Kconfig.platforms | |
| parent | 87411bbcb44ebf4d1de041ae35c60e8ce1470b79 (diff) | |
| parent | 2b905d3a8d7e40c3486abbf585419fafa220a8f8 (diff) | |
| download | op-kernel-dev-8f8aab65459e46f3300f66335b6d001389883597.zip op-kernel-dev-8f8aab65459e46f3300f66335b6d001389883597.tar.gz | |
Merge tag 'hi6220-config-for-4.7v3' of git://github.com/hisilicon/linux-hisi into next/arm64
Merge "ARM64: Hi6220: configure updates for 4.7 based on rc3" from Wei Xu:
- Enable Hi655x PMIC and regulator
- Enable SPI_SPIDEV as module
- Enable several common USB-Ethernet dongles
- Enable configs for WLAN and TI WL1835 as modules
- Enable ARM SP804 for ARCH_HISI
* tag 'hi6220-config-for-4.7v3' of git://github.com/hisilicon/linux-hisi:
arm64: Kconfig: select sp804 timer for ARCH_HISI
arm64: defconfig: enable configs for WLAN and TI WL1835 as modules
arm64: defconfig: enable several common USB network adapters
arm64: defconfig: add CONFIG_SPI_SPIDEV as module
arm64: defconfig: Enable the PMIC and regulator for Hi6220 and 96boards HiKey
Diffstat (limited to 'arch/arm64/Kconfig.platforms')
| -rw-r--r-- | arch/arm64/Kconfig.platforms | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index be543c0..970d22d 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -50,6 +50,7 @@ config ARCH_LG1K config ARCH_HISI bool "Hisilicon SoC Family" + select ARM_TIMER_SP804 select HISILICON_IRQ_MBIGEN help This enables support for Hisilicon ARMv8 SoC family |
