summaryrefslogtreecommitdiffstats
path: root/arch/arm64/boot
diff options
context:
space:
mode:
authorBaruch Siach <baruch@tkos.co.il>2017-09-15 10:50:07 +0300
committerGregory CLEMENT <gregory.clement@free-electrons.com>2017-09-19 16:40:07 +0200
commit9e7460fc325dad06d2066abdbc1f4dd49456f9a4 (patch)
treec27a32126e0973692bef32d300e9718dfdb59ec6 /arch/arm64/boot
parentd03d5d530a46c9def981a2a4ec98f6ec2e9b7878 (diff)
downloadtalos-obmc-linux-9e7460fc325dad06d2066abdbc1f4dd49456f9a4.tar.gz
talos-obmc-linux-9e7460fc325dad06d2066abdbc1f4dd49456f9a4.zip
arm64: dt marvell: Fix AP806 system controller size
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") Cc: <stable@vger.kernel.org> Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Diffstat (limited to 'arch/arm64/boot')
-rw-r--r--arch/arm64/boot/dts/marvell/armada-ap806.dtsi4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
index 4d360713ed12..30d48ecf46e0 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>;
OpenPOWER on IntegriCloud