In the SDHCI pin commonization commit I overlooked the fact that this board had the pins defined in its own DT. Revert their settings to the original values. Signed-off-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxxxxxx> --- arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 38 ++++++++---------------- arch/arm64/boot/dts/qcom/sm8250.dtsi | 4 +-- 2 files changed, 14 insertions(+), 28 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts index a5b742325261..bf05328f3901 100644 --- a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts +++ b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts @@ -858,6 +858,18 @@ dai@2 { }; }; +&sdc2_card_det_n { + /delete-property/ drive-strength; +}; + +&sdc2_cmd_default { + drive-strength = <10>; +}; + +&sdc2_data_default { + drive-strength = <10>; +}; + &sdhc_2 { status = "okay"; pinctrl-names = "default"; @@ -1253,32 +1265,6 @@ wake-n { bias-pull-up; }; }; - - sdc2_default_state: sdc2-default { - clk { - pins = "sdc2_clk"; - bias-disable; - drive-strength = <16>; - }; - - cmd { - pins = "sdc2_cmd"; - bias-pull-up; - drive-strength = <10>; - }; - - data { - pins = "sdc2_data"; - bias-pull-up; - drive-strength = <10>; - }; - }; - - sdc2_card_det_n: sd-card-det-n { - pins = "gpio77"; - function = "gpio"; - bias-pull-up; - }; }; &uart12 { diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi index fe858abbff5d..fab5d83f4496 100644 --- a/arch/arm64/boot/dts/qcom/sm8250.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi @@ -3414,13 +3414,13 @@ clk { bias-disable; }; - cmd { + sdc2_cmd_default: cmd { pins = "sdc2_cmd"; drive-strength = <16>; bias-pull-up; }; - data { + sdc2_data_default: data { pins = "sdc2_data"; drive-strength = <16>; bias-pull-up; -- 2.32.0