diff options
author | Arnd Bergmann <arnd@arndb.de> | 2016-03-01 00:01:31 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2016-03-01 00:01:31 +0100 |
commit | 5f84a8efc42597ecd0ad361e412f61d95b9bc804 (patch) | |
tree | 4c18b2d0040547244c7157c047577ab9bedc1cd0 /arch/arm64/Kconfig.platforms | |
parent | e15cd209fcb5cc8b40997bbd30aaae6e39c2b90c (diff) | |
parent | b3920b2b2388117d0fae5e2d15d626050f6883ea (diff) | |
download | op-kernel-dev-5f84a8efc42597ecd0ad361e412f61d95b9bc804.zip op-kernel-dev-5f84a8efc42597ecd0ad361e412f61d95b9bc804.tar.gz |
Merge tag 'mvebu-arm64-4.6-2' of git://git.infradead.org/linux-mvebu into next/arm64
Merge "mvebu arm64 for 4.6 (part 2)" from Gregory CLEMENT:
Add initial support for Armada 7K/8K
Update Marvell documentation
* tag 'mvebu-arm64-4.6-2' of git://git.infradead.org/linux-mvebu:
arm64: update ARCH_MVEBU for Marvell Armada 7K/8K support
Documentation: arm: add Marvell Armada 7K and 8K families
Documentation: arm: add link to Armada 38x Functional Spec
Documentation: arm: improve Armada 37xx description
Documentation: arm: update Marvell product listing
Diffstat (limited to 'arch/arm64/Kconfig.platforms')
-rw-r--r-- | arch/arm64/Kconfig.platforms | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index e9e0707..c617777 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -60,9 +60,14 @@ config ARCH_MEDIATEK config ARCH_MVEBU bool "Marvell EBU SoC Family" - help - This enables support for Marvell EBU family such as the - Armada 3700 SoC family. + select ARMADA_AP806_CORE_CLK + select ARMADA_AP806_RING_CLK + select MVEBU_ODMI + help + This enables support for Marvell EBU familly, including: + - Armada 3700 SoC Family + - Armada 7K SoC Family + - Armada 8K SoC Family config ARCH_QCOM bool "Qualcomm Platforms" |