Commit 6d5853ff authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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
parents d7c38ff1 1f664ab7

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -1316,7 +1316,7 @@ ARM/MAGICIAN MACHINE SUPPORT 
M:	Philipp Zabel <philipp.zabel@gmail.com>

S:	Maintained



ARM/Marvell Kirkwood and Armada 370, 375, 38x, XP SOC support

ARM/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K SOC support

M:	Jason Cooper <jason@lakedaemon.net>

M:	Andrew Lunn <andrew@lunn.ch>

M:	Gregory Clement <gregory.clement@free-electrons.com>

arch/arm64/Kconfig.platforms

+2 −2
Original line number Diff line number Diff line
@@ -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:

CRA Git | Maintained and supported by SUSTech CRA and CCSE