Skip to content

Commit

Permalink
Merge tag 'mvebu-fixes-4.14-1' of git://git.infradead.org/linux-mvebu…
Browse files Browse the repository at this point in the history
… 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>
  • Loading branch information
Olof Johansson committed Oct 4, 2017
2 parents 180eb4f + 9e7460f commit aab4b41
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
6 changes: 6 additions & 0 deletions MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions arch/arm64/boot/dts/marvell/armada-ap806.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -265,7 +265,7 @@
compatible = "marvell,ap806-pinctrl";
};

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

0 comments on commit aab4b41

Please sign in to comment.