From: Michal Simek Date: Tue, 18 Feb 2020 08:20:21 +0000 (+0100) Subject: arm64: zynqmp: Remove second copy of reset-controller X-Git-Tag: v2020.07-rc1~41^2~4^2~39 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=87b0176fbfb9c6f6fd0cfa575b4f94b9f08c87e6;p=oweals%2Fu-boot.git arm64: zynqmp: Remove second copy of reset-controller Reset controller is handled via firmware that's why it should be the part of firmware node. Origin solution hasn't been removed when above change was applied by commit b07e97b4ba27 ("arm64: zynqmp: Use reset header in zynqmp.dtsi"). Signed-off-by: Michal Simek --- diff --git a/arch/arm/dts/zynqmp.dtsi b/arch/arm/dts/zynqmp.dtsi index 58ac62c4f8..ed28f1f695 100644 --- a/arch/arm/dts/zynqmp.dtsi +++ b/arch/arm/dts/zynqmp.dtsi @@ -201,11 +201,6 @@ }; }; - rst: reset-controller { - compatible = "xlnx,zynqmp-reset"; - #reset-cells = <1>; - }; - xlnx_dp_snd_card: dp_snd_card { compatible = "xlnx,dp-snd-card"; status = "disabled";