From patchwork Sat May 21 20:27:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 575314 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 DABBEC433EF for ; Sat, 21 May 2022 20:27:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241198AbiEUU10 (ORCPT ); Sat, 21 May 2022 16:27:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50278 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244517AbiEUU1Z (ORCPT ); Sat, 21 May 2022 16:27:25 -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 0B4A45AA69 for ; Sat, 21 May 2022 13:27:23 -0700 (PDT) Received: by mail-lj1-x235.google.com with SMTP id m11so1581309ljc.1 for ; Sat, 21 May 2022 13:27:23 -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=P6dEN12+e/3jrGidwJFxqGv3N1U2RblnzTnzycq26RY=; b=DIoLAWszmoWBCmnMpSxqw/ypSTqKQm7Jsmxg0LgguRist0raw/t03Eg0KdwLP1B8dJ a0IcO0tlwLHKwzLlPBe6PrMMrhO5bUt95ZsS9kARkUt7aPM+xNGzjxcH29GE5ZlfFKWg gQ6gOtAohqunQHj3fAYXeSzoAfJ2Qfk+Ow2YeDQlqJJlSPv4jstBJOCIbDVjA3WAh9xS 81QZv8zXwnf5xem327Hu4AY3mUZ+rHE+HLcmNagxt5QXup7BFL4hrFvQTPyollr0sNeA Hr9YSCNhnJej+2vvggq08+56kPd+6NyR6hRz5E3DU8ufO6ehweTb1E6+m26DJW3p1o6U 7Ovg== 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=P6dEN12+e/3jrGidwJFxqGv3N1U2RblnzTnzycq26RY=; b=0m0KGBM3c9gPL9GvCEm6i0LS3ehqSlBQEcDMd3th/vzByq495LPtEKYYAKnyXmE+aJ htAcZsZSLTq4OjmSOzqF2xSL15kfj9vB9+J4hhoXT8aJHxoPzwAlMOvqzUjmWySD68qR vLbXe6RxFYOr2ShSkr5r/2eTG3wIF/z2UyKo/YX3jVepNfPzS4+3ROY2/r2y5xQyoU9d WHSNORfv24h0bz47nX1MRpmXiNEmJQ+mbKd7uQ97a68dlx+dBvtKn237J2B8b08Bj/zT 2h8gkdeDWPI+WT8+x+WWZuksZs1n4+/Pfb0ADEs0UiJeRLBuOOQRJmvuCbr1rEJdLPgR HaGA== X-Gm-Message-State: AOAM533vE6kLQH3ntfMhEXS8l5aomf1TQ8xGW1b8bSmX06CalPI95g0i JDNUNnsrGWjAVIWudbQqQg7OXw== X-Google-Smtp-Source: ABdhPJykaaTR3o9Iapz4G76tONPSRLrqcFU4Ux6/D34ubZKqRA7laAqVzubScp8yNIpr8abNgGeClg== X-Received: by 2002:a2e:391c:0:b0:253:c3e8:8e79 with SMTP id g28-20020a2e391c000000b00253c3e88e79mr8486266lja.304.1653164842185; Sat, 21 May 2022 13:27:22 -0700 (PDT) Received: from eriador.lan ([2001:470:dd84:abc0::8a5]) by smtp.gmail.com with ESMTPSA id x1-20020ac259c1000000b004786291114fsm317773lfn.140.2022.05.21.13.27.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 May 2022 13:27:21 -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 v7 09/11] arm64: dts: qcom: sdm660: move SDHC2 card detect pinconf to board files Date: Sat, 21 May 2022 23:27:06 +0300 Message-Id: <20220521202708.1509308-10-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220521202708.1509308-1-dmitry.baryshkov@linaro.org> References: <20220521202708.1509308-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 Reviewed-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 1c887b9055b3..55de345895e6 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;