diff options
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | arch/arm64/Kconfig.platforms | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index cb3582f460e7..c58557432b62 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -1316,7 +1316,7 @@ ARM/MAGICIAN MACHINE SUPPORT | |||
| 1316 | M: Philipp Zabel <philipp.zabel@gmail.com> | 1316 | M: Philipp Zabel <philipp.zabel@gmail.com> |
| 1317 | S: Maintained | 1317 | S: Maintained |
| 1318 | 1318 | ||
| 1319 | ARM/Marvell Kirkwood and Armada 370, 375, 38x, XP SOC support | 1319 | ARM/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K SOC support |
| 1320 | M: Jason Cooper <jason@lakedaemon.net> | 1320 | M: Jason Cooper <jason@lakedaemon.net> |
| 1321 | M: Andrew Lunn <andrew@lunn.ch> | 1321 | M: Andrew Lunn <andrew@lunn.ch> |
| 1322 | M: Gregory Clement <gregory.clement@free-electrons.com> | 1322 | M: Gregory Clement <gregory.clement@free-electrons.com> |
diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index 970d22d050ae..54967ffd14c1 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms | |||
| @@ -70,8 +70,8 @@ config ARCH_MESON | |||
| 70 | 70 | ||
| 71 | config ARCH_MVEBU | 71 | config ARCH_MVEBU |
| 72 | bool "Marvell EBU SoC Family" | 72 | bool "Marvell EBU SoC Family" |
| 73 | select ARMADA_AP806_CORE_CLK | 73 | select ARMADA_AP806_SYSCON |
| 74 | select ARMADA_AP806_RING_CLK | 74 | select ARMADA_CP110_SYSCON |
| 75 | select MVEBU_ODMI | 75 | select MVEBU_ODMI |
| 76 | help | 76 | help |
| 77 | This enables support for Marvell EBU familly, including: | 77 | This enables support for Marvell EBU familly, including: |
