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

Commit aab4b417 authored Oct 03, 2017 by Olof Johansson

Merge tag 'mvebu-fixes-4.14-1' of git://git.infradead.org/linux-mvebu into fixes

mvebu fixes for 4.14 (part 1)

Update MAINTAINERS for the Macchiatobin board (Armada 8K based)
Fix AP806 system controller size on Armada 7K/8K

* tag 'mvebu-fixes-4.14-1' of git://git.infradead.org/linux-mvebu

:
  arm64: dt marvell: Fix AP806 system controller size
  MAINTAINERS: add Macchiatobin maintainers entry

Signed-off-by: Olof Johansson <olof@lixom.net>

parents 180eb4f1 9e7460fc

MAINTAINERS

+6 −0

Original line number	Diff line number	Diff line
		@@ -8264,6 +8264,12 @@ L: libertas-dev@lists.infradead.org
		S: Orphan
		F: drivers/net/wireless/marvell/libertas/

		MARVELL MACCHIATOBIN SUPPORT
		M: Russell King <rmk@armlinux.org.uk>
		L: linux-arm-kernel@lists.infradead.org
		S: Maintained
		F: arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts

		MARVELL MV643XX ETHERNET DRIVER
		M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
		L: netdev@vger.kernel.org

arch/arm64/boot/dts/marvell/armada-ap806.dtsi

+2 −2

Original line number	Diff line number	Diff line
		@@ -254,7 +254,7 @@

		ap_syscon: system-controller@6f4000 {
		compatible = "syscon", "simple-mfd";
		reg = <0x6f4000 0x1000>;
		reg = <0x6f4000 0x2000>;

		ap_clk: clock {
		compatible = "marvell,ap806-clock";
		@@ -265,7 +265,7 @@
		compatible = "marvell,ap806-pinctrl";
		};

		ap_gpio: gpio {
		ap_gpio: gpio@1040 {
		compatible = "marvell,armada-8k-gpio";
		offset = <0x1040>;
		ngpios = <20>;