diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-05-10 14:53:01 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-05-10 14:53:01 +0200 |
| commit | 6d5853ffe655192d4b18d7092bb060d5e69d777c (patch) | |
| tree | 423846bde0490cc2ac3323b4ec026d8f641f90fd /arch/arm64/Kconfig.platforms | |
| parent | d7c38ff1cd868cd61b96cf1ff8c2bd72445332c7 (diff) | |
| parent | 1f664ab7d9d46abdcde294e3e6e9d5d98a2e6f73 (diff) | |
| download | linux-0-day-6d5853ffe655192d4b18d7092bb060d5e69d777c.tar.gz linux-0-day-6d5853ffe655192d4b18d7092bb060d5e69d777c.tar.xz | |
Merge tag 'mvebu-arm64-4.7-1' of git://git.infradead.org/linux-mvebu into next/arm64
Merge "mvebu arm64 for 4.7" from Gregory CLEMENT:
- Mention the arm64 SoCs in the MAINTAINER file
- Enable syscon drivers for Marvell Armada 7K/8K (replacing the clk
one)
* tag 'mvebu-arm64-4.7-1' of git://git.infradead.org/linux-mvebu:
MAINTAINERS: update entry for Marvell ARM platform maintainers
arm64: marvell: enable AP806 and CP110 syscon driver
Diffstat (limited to 'arch/arm64/Kconfig.platforms')
| -rw-r--r-- | arch/arm64/Kconfig.platforms | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index 970d22d050aee..54967ffd14c13 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -70,8 +70,8 @@ config ARCH_MESON config ARCH_MVEBU bool "Marvell EBU SoC Family" - select ARMADA_AP806_CORE_CLK - select ARMADA_AP806_RING_CLK + select ARMADA_AP806_SYSCON + select ARMADA_CP110_SYSCON select MVEBU_ODMI help This enables support for Marvell EBU familly, including: |