| Message ID | 20220202132301.v3.10.Id346b23642f91e16d68d75f44bcdb5b9fbd155ea@changeid |
|---|---|
| State | Accepted |
| Commit | ad4152d6e2599c62ef012e528acc5e77ca6765c1 |
| Headers | show |
| Series | arm64: dts: qcom: sc7x80: A smattering of misc dts cleanups + herobrine-rev1 | expand |
On Wed, Feb 02, 2022 at 01:23:44PM -0800, Douglas Anderson wrote: > 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: Matthias Kaehlcke <mka@chromium.org>
Quoting Douglas Anderson (2022-02-02 13:23:44) > 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>
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 3c5aab225748..bdc3f341ecf6 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 @@ &usb_2_hsphy { /* PINCTRL - additions to nodes defined in sc7280.dtsi */ +&dp_hot_plug_det { + bias-disable; +}; + &pcie1_clkreq_n { bias-disable; drive-strength = <2>; diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi index 9140dca3b72a..325f50925451 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi @@ -355,6 +355,10 @@ bluetooth: bluetooth { /* 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 a2e3aa6ecdd3..1776523e169a 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -3282,7 +3282,6 @@ tlmm: pinctrl@f100000 { dp_hot_plug_det: dp-hot-plug-det { pins = "gpio47"; function = "dp_hot"; - bias-disable; }; edp_hot_plug_det: edp-hot-plug-det {
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> --- Changes in v3: - ("Remove dp_hot_plug_det pull from SoC dtsi file") new for v3. arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts | 4 ++++ arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 4 ++++ arch/arm64/boot/dts/qcom/sc7280.dtsi | 1 - 3 files changed, 8 insertions(+), 1 deletion(-)