Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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
Arnd Bergmann 9 years ago
parent
d7c38ff1cd 1f664ab7d9
commit
6d5853ffe6
2 changed files with 3 additions and 3 deletions
Split View Show Diff Stats
  1. 1 1
      MAINTAINERS
  2. 2 2
      arch/arm64/Kconfig.platforms

+ 1 - 1
MAINTAINERS
View File 

@@ -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>

+ 2 - 2
arch/arm64/Kconfig.platforms
View File 

@@ -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: