On 2022-05-14 22:01:36, Dmitry Baryshkov wrote:
> This results in dts duplication, but per mutual agreement card detect
> pin configuration belongs to the board files. Move it from the SoC
... depends on the board [hence belongs to the board files]...
> dtsi to the board DT files.
>
> Suggested-by: Marijn Suijten <marijn.suijten@xxxxxxxxxxxxxx>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
Reviewed-by: Marijn Suijten <marijn.suijten@xxxxxxxxxxxxxx>
> ---
> .../boot/dts/qcom/sdm630-sony-xperia-nile.dtsi | 16 ++++++++++++++++
> arch/arm64/boot/dts/qcom/sdm630.dtsi | 12 ------------
> .../boot/dts/qcom/sdm660-xiaomi-lavender.dts | 16 ++++++++++++++++
> 3 files changed, 32 insertions(+), 12 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi
> index 00baacf28c63..ccde9951e4fb 100644
> --- a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi
> @@ -549,6 +549,22 @@ vreg_l19a_3p3: l19 {
> };
> };
>
> +&sdc2_state_on {
> + sd-cd {
> + pins = "gpio54";
> + bias-pull-up;
> + drive-strength = <2>;
> + };
> +};
> +
> +&sdc2_state_off {
> + sd-cd {
> + pins = "gpio54";
> + bias-disable;
> + drive-strength = <2>;
> + };
> +};
> +
> &sdhc_1 {
> status = "okay";
> supports-cqe;
> diff --git a/arch/arm64/boot/dts/qcom/sdm630.dtsi b/arch/arm64/boot/dts/qcom/sdm630.dtsi
> index 44f048934fc6..e6f06a548011 100644
> --- a/arch/arm64/boot/dts/qcom/sdm630.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm630.dtsi
> @@ -983,12 +983,6 @@ data {
> bias-pull-up;
> drive-strength = <10>;
> };
> -
> - sd-cd {
> - pins = "gpio54";
> - bias-pull-up;
> - drive-strength = <2>;
> - };
> };
>
> sdc2_state_off: sdc2-off {
> @@ -1009,12 +1003,6 @@ data {
> bias-pull-up;
> drive-strength = <2>;
> };
> -
> - sd-cd {
> - pins = "gpio54";
> - bias-disable;
> - drive-strength = <2>;
> - };
> };
> };
>
> diff --git a/arch/arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dts b/arch/arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dts
> index 9280c1f0c334..2b1216502eb0 100644
> --- a/arch/arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dts
> +++ b/arch/arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dts
> @@ -363,6 +363,22 @@ vreg_l19a_3p3: l19 {
> };
> };
>
> +&sdc2_state_on {
> + sd-cd {
> + pins = "gpio54";
> + bias-pull-up;
> + drive-strength = <2>;
> + };
> +};
> +
> +&sdc2_state_off {
> + sd-cd {
> + pins = "gpio54";
> + bias-disable;
> + drive-strength = <2>;
> + };
> +};
> +
> &sdhc_1 {
> status = "okay";
> supports-cqe;
> --
> 2.35.1
>
