diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-02-22 17:44:19 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-02-22 17:44:19 +0100 |
| commit | ac07b9aa68170a1a99f0e5a4d8d30f83a75b5aa7 (patch) | |
| tree | 42e78020e60e62c80a292a31506f9763abff6e25 /arch/arm | |
| parent | eec51afc9d2612c65523627cfd81456c6995a79a (diff) | |
| parent | 8aa36a8dcde3183d84db7b0d622ffddcebb61077 (diff) | |
Merge tag 'mvebu-fixes-4.16-1' of git://git.infradead.org/linux-mvebu into fixes
Pull "mvebu fixes for 4.16 (part 1)" from Gregory CLEMENT:
- Updating my emails address (from free-electrons to bootlin)
- Adding back the selection of the PL310 Errata fix for the Cortex A9
based Armada SoCs (Armada 375 and 38x)
* tag 'mvebu-fixes-4.16-1' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: Fix broken PL310_ERRATA_753970 selects
MAINTAINERS: update email address for Gregory CLEMENT
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-mvebu/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index 6b32dc527edc..2c20599cc350 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@ -41,7 +41,7 @@ config MACH_ARMADA_375 depends on ARCH_MULTI_V7 select ARMADA_370_XP_IRQ select ARM_ERRATA_720789 - select ARM_ERRATA_753970 + select PL310_ERRATA_753970 select ARM_GIC select ARMADA_375_CLK select HAVE_ARM_SCU @@ -57,7 +57,7 @@ config MACH_ARMADA_38X bool "Marvell Armada 380/385 boards" depends on ARCH_MULTI_V7 select ARM_ERRATA_720789 - select ARM_ERRATA_753970 + select PL310_ERRATA_753970 select ARM_GIC select ARM_GLOBAL_TIMER select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK |