From: Michal Simek <michal.simek@xilinx.com>
Date: Tue, 18 Feb 2020 12:04:06 +0000 (+0100)
Subject: arm64: zynqmp: Move pinctrl node under firmware node
X-Git-Tag: v2020.07-rc1~41^2~4^2~32
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=00fb945cf56bfe3d8ca7b1c2e38740c4c94a15c7;p=oweals%2Fu-boot.git

arm64: zynqmp: Move pinctrl node under firmware node

Pinctrl is handled via firmare interface that's why move it there without
reg property and new compatible string.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

diff --git a/arch/arm/dts/zynqmp.dtsi b/arch/arm/dts/zynqmp.dtsi
index aa28158222..1634af0bd8 100644
--- a/arch/arm/dts/zynqmp.dtsi
+++ b/arch/arm/dts/zynqmp.dtsi
@@ -167,6 +167,11 @@
 				compatible = "xlnx,zynqmp-reset";
 				#reset-cells = <1>;
 			};
+
+			pinctrl0: pinctrl {
+				compatible = "xlnx,zynqmp-pinctrl";
+				status = "disabled";
+			};
 		};
 	};
 
@@ -765,12 +770,6 @@
 			clock-output-names = "clk_out_sd1", "clk_in_sd1";
 		};
 
-		pinctrl0: pinctrl@ff180000 {
-			compatible = "xlnx,pinctrl-zynqmp";
-			status = "disabled";
-			reg = <0x0 0xff180000 0x0 0x1000>;
-		};
-
 		smmu: smmu@fd800000 {
 			compatible = "arm,mmu-500";
 			reg = <0x0 0xfd800000 0x0 0x20000>;