diff options
| author | Douglas Anderson <dianders@chromium.org> | 2022-02-03 00:23:44 +0300 |
|---|---|---|
| committer | Bjorn Andersson <bjorn.andersson@linaro.org> | 2022-02-05 00:53:33 +0300 |
| commit | ad4152d6e2599c62ef012e528acc5e77ca6765c1 (patch) | |
| tree | 67c8be7e5676ab4bec682b76a18291994e59a716 | |
| parent | 376e9183c1d1dde6972257a823cf484cc5124b7b (diff) | |
| download | linux-ad4152d6e2599c62ef012e528acc5e77ca6765c1.tar.xz | |
arm64: dts: qcom: sc7280: Move dp_hot_plug_det pull from SoC dtsi file
Pulls should be in the board files, not in the SoC dtsi
file. Remove. Even though the sc7280 boards don't currently refer to
dp_hot_plug_det, let's re-add the pulls there just to keep this as a
no-op change. If boards don't need this / don't want it later then we
can remove it from them.
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220202132301.v3.10.Id346b23642f91e16d68d75f44bcdb5b9fbd155ea@changeid
| -rw-r--r-- | arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts | 4 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/qcom/sc7280.dtsi | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts index 82c3c8f0342b..b36d12f8f4a0 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts @@ -826,6 +826,10 @@ ap_ec_spi: &spi8 { /* PINCTRL - additions to nodes defined in sc7280.dtsi */ +&dp_hot_plug_det { + bias-disable; +}; + &pcie1_clkreq_n { bias-pull-up; drive-strength = <2>; diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi index 6e20e8c07402..ecbf2b89d896 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi @@ -355,6 +355,10 @@ /* PINCTRL - additions to nodes defined in sc7280.dtsi */ +&dp_hot_plug_det { + bias-disable; +}; + &pm7325_gpios { key_vol_up_default: key-vol-up-default { pins = "gpio6"; diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi index 5b20cd40d896..54995212280d 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -3284,7 +3284,6 @@ dp_hot_plug_det: dp-hot-plug-det { pins = "gpio47"; function = "dp_hot"; - bias-disable; }; edp_hot_plug_det: edp-hot-plug-det { |