From: Michal Simek <michal.simek@xilinx.com>
Date: Thu, 9 Jan 2020 12:10:59 +0000 (+0100)
Subject: arm64: zynqmp: Sync gpio-controller name location
X-Git-Tag: v2020.04-rc1~20^2~3
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b94a3c2ebe74a6e644cbc285502c6082b27f43b0;p=oweals%2Fu-boot.git

arm64: zynqmp: Sync gpio-controller name location

Sync location with mainline kernel.
Added by Linux kernel commit 75926f07baae
("arm64: dts: zynqmp: Add missing gpio-controller to ps gpio").

Fixes: 0b33e0b15600 ("arm64: zynqmp: Add missing gpio property to dtsi")
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

diff --git a/arch/arm/dts/zynqmp.dtsi b/arch/arm/dts/zynqmp.dtsi
index 232fd0c11c..9e7fae83f7 100644
--- a/arch/arm/dts/zynqmp.dtsi
+++ b/arch/arm/dts/zynqmp.dtsi
@@ -626,12 +626,12 @@
 			compatible = "xlnx,zynqmp-gpio-1.0";
 			status = "disabled";
 			#gpio-cells = <0x2>;
+			gpio-controller;
 			interrupt-parent = <&gic>;
 			interrupts = <0 16 4>;
 			interrupt-controller;
 			#interrupt-cells = <2>;
 			reg = <0x0 0xff0a0000 0x0 0x1000>;
-			gpio-controller;
 			power-domains = <&zynqmp_firmware PD_GPIO>;
 		};