Skip to content

Commit

Permalink
arm64: dt marvell: Fix AP806 system controller size
Browse files Browse the repository at this point in the history
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: 63dac0f ("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>
  • Loading branch information
Baruch Siach authored and Gregory CLEMENT committed Sep 19, 2017
1 parent d03d5d5 commit 9e7460f
Showing 1 changed file with 2 additions and 2 deletions.
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 9e7460f

Please sign in to comment.