Skip to contentSkip to conversation

Patch "arm64: dt marvell: Fix AP806 system controller size" has been added to the 4.13-stable tree

PATCH [email protected] 1 participant 1 message Oct 10, 2017

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

arm64: dt marvell: Fix AP806 system controller size

to the 4.13-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
arm64-dt-marvell-fix-ap806-system-controller-size.patch
and it can be found in the queue-4.13 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 9e7460fc325dad06d2066abdbc1f4dd49456f9a4 Mon Sep 17 00:00:00 2001

From: Baruch Siach <[email protected]>
Date: Fri, 15 Sep 2017 10:50:07 +0300
Subject: arm64: dt marvell: Fix AP806 system controller size

From: Baruch Siach <[email protected]>

commit 9e7460fc325dad06d2066abdbc1f4dd49456f9a4 upstream.

Extend the container size to 0x2000 to include the gpio controller at offset 0x1040.

While at it, add start address notation to the gpio node name to match its 'offset' property.

Fixes 63dac0f4924b ("arm64: dts: marvell: add gpio support for Armada

7K/8K")

---
 arch/arm64/boot/dts/marvell/armada-ap806.dtsi |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/marvell/armada-ap806.dtsi +2 -2
@@ -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>;

Patches currently in stable-queue which might be from [email protected] are

queue-4.13/arm64-dt-marvell-fix-ap806-system-controller-size.patch