Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac07b9aa authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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
parents eec51afc 8aa36a8d

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -1590,7 +1590,7 @@ ARM/Marvell Dove/MV78xx0/Orion SOC support 
M:	Jason Cooper <jason@lakedaemon.net>

M:	Andrew Lunn <andrew@lunn.ch>

M:	Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>

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

M:	Gregory Clement <gregory.clement@bootlin.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	Documentation/devicetree/bindings/soc/dove/
@@ -1604,7 +1604,7 @@ F: arch/arm/boot/dts/orion5x* 
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>

M:	Gregory Clement <gregory.clement@bootlin.com>

M:	Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

arch/arm/mach-mvebu/Kconfig

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