diff options
author | Olof Johansson <olof@lixom.net> | 2017-09-01 19:37:02 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2017-09-01 19:37:02 -0400 |
commit | 6f71a925761e7843965a704eb6682ea337abb4a5 (patch) | |
tree | 3eb75dbf1e7d846bccc1866bd25a48db91811791 | |
parent | fabed5ad230a5ff8320b2928ec20a52e59a9bf60 (diff) | |
parent | a0ac89b57207ccc87d76f4e6aa9a83026743861b (diff) |
Merge tag 'mvebu-fixes-4.13-3' of git://git.infradead.org/linux-mvebu into fixes
mvebu fixes for 4.13 (part 3)
Fix number of GPIOs in AP806 description for Armada 7K/8K
* tag 'mvebu-fixes-4.13-3' of git://git.infradead.org/linux-mvebu:
arm64: dts: marvell: fix number of GPIOs in Armada AP806 description
Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r-- | arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 4 |
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 1eb1f1e9aac4..4d360713ed12 100644 --- a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi | |||
@@ -268,10 +268,10 @@ | |||
268 | ap_gpio: gpio { | 268 | ap_gpio: gpio { |
269 | compatible = "marvell,armada-8k-gpio"; | 269 | compatible = "marvell,armada-8k-gpio"; |
270 | offset = <0x1040>; | 270 | offset = <0x1040>; |
271 | ngpios = <19>; | 271 | ngpios = <20>; |
272 | gpio-controller; | 272 | gpio-controller; |
273 | #gpio-cells = <2>; | 273 | #gpio-cells = <2>; |
274 | gpio-ranges = <&ap_pinctrl 0 0 19>; | 274 | gpio-ranges = <&ap_pinctrl 0 0 20>; |
275 | }; | 275 | }; |
276 | }; | 276 | }; |
277 | }; | 277 | }; |