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 8C9CFC433EF for ; Sat, 14 May 2022 14:11:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230124AbiENOLW (ORCPT ); Sat, 14 May 2022 10:11:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46122 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232976AbiENOKw (ORCPT ); Sat, 14 May 2022 10:10:52 -0400 Received: from mail-lf1-x132.google.com (mail-lf1-x132.google.com [IPv6:2a00:1450:4864:20::132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 09228140DD for ; Sat, 14 May 2022 07:10:50 -0700 (PDT) Received: by mail-lf1-x132.google.com with SMTP id u23so18948972lfc.1 for ; Sat, 14 May 2022 07:10:50 -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=PIPhrHSX0vDaE6umAr6Uz83mLWrCmZ9TxDaxz4FKhdY=; b=ljDlVvdD4mMOmXSlRL8FCA6+V2POm2uIk4NElroUmvzAVTsgq3Ndudktq0m2dUE2eD d4nA/ASkSyi0Ad3lFvICu924OEt1n/4X2XVyhDLtAmwpeS0lO7ReNaRo6qX6+gVWTH37 /KaZtjGMLGasRE6AcWD3wvMbRobxyYktW+z3SHftbRXeSAz3VXUsKYBxsAFH2nffpOhU 6cO6XlwQbtRuW0Owr/ard9X3W/5VCZkouOM1s4LKZu6xIU+A3b6OBsu+PrKszSvRoJdW t9/uPXqoiHqKVjvFENzumi33eBYsdqxWHfomKk57KRc5zTlxpp6e32hJgJmMhIibSC0Y zM9A== 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=PIPhrHSX0vDaE6umAr6Uz83mLWrCmZ9TxDaxz4FKhdY=; b=S1v3jYht7mbXwEsK4Yx9uqByGrZJc94rryLFCzm+U/pEjb68IjpYGAe26YFoTrB1El mHm9HkdQVR2FOpqEpyhZfd3+JQkvLQ8qdc4HnnSQ37XyQkOVA8hsjiruZ5LPu+oRbqW5 YmA+rBP6QHIimi7OhyKDQ8gY9UIWRANiBtlQhhsR5/adceM56iQCXf2cq76wt5BsycEo sA+YcVPCYYdpFyEe1+DEJajZcLs10w3Gpe+NiDRHROvfP0kq9NnUyEiqOrTmKj+fllPe qNgGqYAIylQk4W0iaAMfl/G+aZvjdK3qEylnbe6P7M0yghocgzGcufAXqYoBTOIjzoij dyFg== X-Gm-Message-State: AOAM5322qISXCuzk/WEpHD1rTP6NeB2PPmq89IMpz8WBiTNZo43X5ngW dU9TgC8H5tlUcRMAIOzYliYjhA== X-Google-Smtp-Source: ABdhPJyRGew1JK1nZsJhMCqES0pLUXwuFX5Usolj6U1v6Ye3QbczlArwNUmZj7OclsTRWV7drc8CCg== X-Received: by 2002:a05:6512:33c9:b0:473:a418:2da7 with SMTP id d9-20020a05651233c900b00473a4182da7mr6766972lfg.356.1652537450511; Sat, 14 May 2022 07:10:50 -0700 (PDT) Received: from eriador.lan ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id x9-20020a05651c104900b0024f3d1daedasm845912ljm.98.2022.05.14.07.10.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 May 2022 07:10:50 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski , Konrad Dybcio , Marijn Suijten Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v4 10/12] arm64: dts: qcom: sdm660: move SDHC2 card detect pinconf to board files Date: Sat, 14 May 2022 17:10:39 +0300 Message-Id: <20220514141041.3158521-11-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220514141041.3158521-1-dmitry.baryshkov@linaro.org> References: <20220514141041.3158521-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@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 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