From patchwork Sat May 21 15:20:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 575328 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 D413EC43217 for ; Sat, 21 May 2022 15:21:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355187AbiEUPVR (ORCPT ); Sat, 21 May 2022 11:21:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45850 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355393AbiEUPVH (ORCPT ); Sat, 21 May 2022 11:21:07 -0400 Received: from mail-lj1-x235.google.com (mail-lj1-x235.google.com [IPv6:2a00:1450:4864:20::235]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 94C5BEE02 for ; Sat, 21 May 2022 08:21:05 -0700 (PDT) Received: by mail-lj1-x235.google.com with SMTP id e4so11961088ljb.13 for ; Sat, 21 May 2022 08:21:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=o0db24Z75xgiNaK8stR7e/3GBiXrKYoix4PN4HjCWow=; b=qw1/hiTL0nYvxep71cj+EHA5GcGh1/X0mTM/ZQs/S9K0rjfZjDGHXefX87UTw6HYNe TP/IGXd0svQZ40rPtHJ02RDmWrCKWpjJGHgromAxwXjtbwWVAwy3aPZ+CWiwnCnorLah YPGLCO2jpk8UeWP19HxKo4l+f39pzC/K2t3/lGC459N+BxVl66caT9O29U6+SWIYbXjj 6idk5IcmAU2q0LT3kO6zEzMZfXfe28SRBK2fWqJXo8Krz4qsPCftOfIS8/Ob9+aEKmnl wqO3+5tEFTFGQhUtAR60yf6XEVQ3n2HWWP401BREE350G03FSWEvtlWOKNnwEypA2xEs xrBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=o0db24Z75xgiNaK8stR7e/3GBiXrKYoix4PN4HjCWow=; b=KfY+jS/Hd+iZNCNq8VjgvaDEg0QIn18ju365IHbVkfWiQ4ijYnNRohx44YR2HaqCc7 JI2dEIv/kGjyalAQbBERvfpL1NUAUX4ZRzA9eKqKgOCc1+cu//9jbtybwfhlE+cKnUan XS/PEfpPreoDGtgYMTbED6mJV1JUgk5HAfp4hYlk/ukvFuzP8EU9Ua6cOxV4UzMAYhBY m22Xci51w7O79zUZ5K3U4/PUpx2tSzryzLdfpqpmSIubm4l4q9p9xi6hov7vkeAH5KXQ w29xZaixtoEz8TFl5+ycSJ0Ku6WD6QUZB/HSb0LgeJAftDSY0YTXPRtFSWPYiHSKPREI T+vw== X-Gm-Message-State: AOAM532x7R8bQ1WXtkxi7EUkxJxsrp4m7CTveaqyEvleehfXdLNtmqqd u+sSEZ49OSfRenVcQvFHlOWpcA== X-Google-Smtp-Source: ABdhPJwjsR1wpmWIjZgbo03vb4WRedzC8BBCJ5bZeizDuaiMJz4c9FFnlBgJBNXTvnDBblRjZJdlbA== X-Received: by 2002:a2e:9a86:0:b0:253:cbc9:a977 with SMTP id p6-20020a2e9a86000000b00253cbc9a977mr8145046lji.143.1653146463860; Sat, 21 May 2022 08:21:03 -0700 (PDT) Received: from eriador.lumag.spb.ru ([94.25.229.156]) by smtp.gmail.com with ESMTPSA id k8-20020a2e92c8000000b0024f3d1daeccsm739933ljh.84.2022.05.21.08.21.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 May 2022 08:21:03 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, Marijn Suijten Subject: [PATCH v6 09/11] arm64: dts: qcom: sdm660: move SDHC2 card detect pinconf to board files Date: Sat, 21 May 2022 18:20:47 +0300 Message-Id: <20220521152049.1490220-10-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220521152049.1490220-1-dmitry.baryshkov@linaro.org> References: <20220521152049.1490220-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org 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 --- .../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;