diff options
| author | Olof Johansson <olof@lixom.net> | 2017-10-03 18:10:40 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-10-03 18:10:40 -0700 |
| commit | aab4b4177eb51f5a0a162600f25e75f9dd487d71 (patch) | |
| tree | 45cf10854a6cdec8fbfc3332022328da6f0cdf30 | |
| parent | 180eb4f17eab106982ef100787a485974bef4749 (diff) | |
| parent | 9e7460fc325dad06d2066abdbc1f4dd49456f9a4 (diff) | |
| download | x86-mpx-aab4b4177eb51f5a0a162600f25e75f9dd487d71.tar.gz | |
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>
| -rw-r--r-- | MAINTAINERS | 6 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 60be46dc3fa85..a422ff1ef3380 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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 diff --git a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi index 4d360713ed124..30d48ecf46e08 100644 --- a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi @@ -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>; |