diff mbox series

arm64: dts: qcom: sc7180: Drop duplicate dp_hot_plug_det node in trogdor

Message ID 20210311131008.1.I85fc8146c0ee47e261faa0c54dd621467b81952d@changeid
State New
Headers show
Series arm64: dts: qcom: sc7180: Drop duplicate dp_hot_plug_det node in trogdor | expand

Commit Message

Doug Anderson March 11, 2021, 9:12 p.m. UTC 
From: Stephen Boyd <swboyd@chromium.org>

This moved from being trogdor specific to being part of the general
sc7180.dtsi SoC file in commit 681a607ad21a ("arm64: dts: qcom:
sc7180: Add DisplayPort HPD pin dt node"). Then we dropped the pinconf
from the general sc7180.dtsi file in commit 8d079bf20410 ("arm64: dts:
qcom: sc7180: Drop pinconf on dp_hot_plug_det") and added it back to
the trogdor dts file in commit f772081f4883 ("arm64: dts: qcom:
sc7180: Add "dp_hot_plug_det" pinconf for trogdor").

As part of this we managed to forget to drop the old copy in the
trogdor dts. Let's do it now.

Signed-off-by: Stephen Boyd <swboyd@chromium.org>
[dianders: updated desc]
Signed-off-by: Douglas Anderson <dianders@chromium.org>
---
Sorry for missing this in my last batch. I think my eyes glazed over
everything "dp" related as not-done-yet even though this one is easy
to do now.

 arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 14 --------------
 1 file changed, 14 deletions(-)

Comments

Stephen Boyd March 13, 2021, 10:45 p.m. UTC | #1 
Quoting Douglas Anderson (2021-03-11 13:12:41)
> From: Stephen Boyd <swboyd@chromium.org>

> 

> This moved from being trogdor specific to being part of the general

> sc7180.dtsi SoC file in commit 681a607ad21a ("arm64: dts: qcom:

> sc7180: Add DisplayPort HPD pin dt node"). Then we dropped the pinconf

> from the general sc7180.dtsi file in commit 8d079bf20410 ("arm64: dts:

> qcom: sc7180: Drop pinconf on dp_hot_plug_det") and added it back to

> the trogdor dts file in commit f772081f4883 ("arm64: dts: qcom:

> sc7180: Add "dp_hot_plug_det" pinconf for trogdor").

> 

> As part of this we managed to forget to drop the old copy in the

> trogdor dts. Let's do it now.

> 

> Signed-off-by: Stephen Boyd <swboyd@chromium.org>

> [dianders: updated desc]

> Signed-off-by: Douglas Anderson <dianders@chromium.org>

> ---


Thanks for the catch!
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
index 436582279dad..192e2e424fde 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
@@ -1155,20 +1155,6 @@  pinconf {
 		};
 	};
 
-	dp_hot_plug_det: dp-hot-plug-det {
-		 pinmux {
-			 pins = "gpio117";
-			 function = "dp_hot";
-		 };
-
-		 config {
-			 pins = "gpio117";
-			 bias-disable;
-			 input-enable;
-			 drive-strength = <2>;
-		 };
-	 };
-
 	edp_brij_en: edp-brij-en {
 		pinmux {
 			pins = "gpio104";