From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 489ABC433FE for ; Sat, 21 May 2022 16:19:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245461AbiEUQTV (ORCPT ); Sat, 21 May 2022 12:19:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56946 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237279AbiEUQTU (ORCPT ); Sat, 21 May 2022 12:19:20 -0400 Received: from relay04.th.seeweb.it (relay04.th.seeweb.it [5.144.164.165]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C37C477F30 for ; Sat, 21 May 2022 09:19:19 -0700 (PDT) Received: from SoMainline.org (94-209-165-62.cable.dynamic.v4.ziggo.nl [94.209.165.62]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by m-r1.th.seeweb.it (Postfix) with ESMTPSA id 2B2352006E; Sat, 21 May 2022 18:19:18 +0200 (CEST) Date: Sat, 21 May 2022 18:19:17 +0200 From: Marijn Suijten To: Dmitry Baryshkov Cc: Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Subject: Re: [PATCH v6 09/11] arm64: dts: qcom: sdm660: move SDHC2 card detect pinconf to board files Message-ID: <20220521161917.3bo7hf75dkmu34gk@SoMainline.org> References: <20220521152049.1490220-1-dmitry.baryshkov@linaro.org> <20220521152049.1490220-10-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220521152049.1490220-10-dmitry.baryshkov@linaro.org> Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On 2022-05-21 18:20:47, 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 > dtsi to the board DT files. > > Suggested-by: Marijn Suijten > Signed-off-by: Dmitry Baryshkov Reviewed-by: Marijn Suijten > --- > .../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 bcda3a1dd249..e6de49e14840 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 >