From patchwork Tue Mar 14 07:40:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhupesh Sharma X-Patchwork-Id: 69345 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1616786wrd; Tue, 14 Mar 2023 00:41:09 -0700 (PDT) X-Google-Smtp-Source: AK7set/904IrBVuRC+qDtxE16koYzF1IAN2w5LZJr9XjvRLVRa3CPxOiZ90y/uA9XV9G5aJyAmqn X-Received: by 2002:a17:90a:d3cc:b0:23b:4005:26ee with SMTP id d12-20020a17090ad3cc00b0023b400526eemr9471093pjw.46.1678779669093; Tue, 14 Mar 2023 00:41:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678779669; cv=none; d=google.com; s=arc-20160816; b=YvMoaAsLb7V0YD1vG+7QI4/IWSFJlr+MB7Hht5PwFlHGA/aWGm/wak88EVs7LvKH8k HmI0Tp9BGxkb7M3QbK1gMJ3+rJ2Yfbs93nkCByScno3ESpORO9HWYLe1U4XvL8LcraEH Ff6ZPcfOXevcp1Lvdmd4hfgq+1kcKIsIs9x6ol8MgNSLr+dUXsLr4Q3SJBo3lzD4MD8p s/FCZKOsyMA7UjaelLOy92TTHGpGmvSrXCeVG0zHu6IPXUB6k/k/olGJoOBqPSQejlkW 5mcVXcE6dyk8evEuLteNrgZ2Ze4E7fAIv1TKyvKC62DZYCxkCCxGAiOEQNckT0Z7iAFp rlNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=sLxEHBJM5aBlcBtcL4I4cmvZzwwEog5yFTPmXjO+FxE=; b=z6ofH2E7fJgoL1P3oDu5RLTWiwFmGN2XMrBF2W8Max7mGpf6t/S0Kc8mAzh9ow8og5 GxPnjw2N2eD3l4U3cvkT9sjGl5oPAQHz+C/6fPH47UWCfD275kUPeRWpAv12dKEiy3mj xh6G1seoIHCAg2LaoFbhiIqLU/GPTsnNAXlekkjn+rdl/Tb4R04KmRkh4vguTtK+aq/n 4NyKExTB1ayEUtTraoGNt3Do2ryGbKGJmMqKgL9+384TPJ0wDnpIxNhY/s85l5VzqmYU EEIQL6G7MsinoloudVzRK0oN0BxcHAajNTMzzWlAhcj14ue2KBfCUKqDZyLr4JDynwFI 6T9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=l1IaoeBi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v22-20020a17090ad59600b0023c1f976f2dsi1822251pju.85.2023.03.14.00.40.54; Tue, 14 Mar 2023 00:41:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=l1IaoeBi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230033AbjCNHkO (ORCPT + 99 others); Tue, 14 Mar 2023 03:40:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56822 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229689AbjCNHkM (ORCPT ); Tue, 14 Mar 2023 03:40:12 -0400 Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [IPv6:2607:f8b0:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8F00A8C954 for ; Tue, 14 Mar 2023 00:40:09 -0700 (PDT) Received: by mail-pl1-x62e.google.com with SMTP id ja10so5997744plb.5 for ; Tue, 14 Mar 2023 00:40:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678779609; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=sLxEHBJM5aBlcBtcL4I4cmvZzwwEog5yFTPmXjO+FxE=; b=l1IaoeBiQDXzjh5BdZkj9W0IJVdg8Nq68Sk1HEOvpFLmskNoDeAPzSviOqzJWoitpP 5Ff5x8ivl+ocb0IHomeemsHYJ93NTC0qqbkoTaXmsbQ33Zw20jaOcTM1GTl/eE/ZbrBs OFibCP0xxKcH6vu2xe/R8pSXEWTpl7OQ2ZSdz7U90wCvQYJgla4nAlK2DSFAS6TLkAnC xQ6ItBZ8IGXDPUEPR/T3vn5Ve300uw5mpn6Rp97uHBv3/ijFo3aQ2AxCoRgFmsjGmoaR VuY+9jDxslKOQHk8Mim2G+65HjpwyCi+uwDXX2ch/ne+uz4ayPJ94Dr8JmpPNckB8qr/ P4qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678779609; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=sLxEHBJM5aBlcBtcL4I4cmvZzwwEog5yFTPmXjO+FxE=; b=WKlFLkuH+mRgXSljpImvs0GSYvfERG8YLdI7/vxBqXIIuDWxjZ8dW3XmzirmaB4ra+ QASa5cTfCQZ0Q6WPlvcQK3bVe6iAp21+ObKPB/oXSulvCY3plNwtbO29rh7l4i53geVn kkFcr079M0cA+HAWTXKtr7f5eAmdhSDMRvDljynCQO1JwFs6JKg8UP53lc4Eas7s7Hle H6tEchXgOCrGxaHNoSdpLd0TJW6lO72ER+ZqVIq+Tu/UbGUQv9XuQlWVtvDqd60fU405 4nW8cb8D4nMZLmkJw3TVzF6sb9KjsHLN2o9st31N9wdXBhT0GeiUdE4Ui4wVLPCId6Af NN6Q== X-Gm-Message-State: AO0yUKUc5tvtFJKqyReclBJ76eXthg9ewRnrBtf9ZJE973EDP5KktRkw eL+fnEHaGG2u56B7M3nbJQpIxA== X-Received: by 2002:a17:90b:3ecb:b0:23d:3761:6085 with SMTP id rm11-20020a17090b3ecb00b0023d37616085mr1463352pjb.34.1678779608994; Tue, 14 Mar 2023 00:40:08 -0700 (PDT) Received: from localhost.localdomain ([2401:4900:1c5e:4a3e:15d0:d540:3861:ef0e]) by smtp.gmail.com with ESMTPSA id h14-20020a17090aea8e00b002372106a5c2sm1034602pjz.37.2023.03.14.00.40.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Mar 2023 00:40:08 -0700 (PDT) From: Bhupesh Sharma To: linux-arm-msm@vger.kernel.org Cc: agross@kernel.org, andersson@kernel.org, konrad.dybcio@linaro.org, linux-kernel@vger.kernel.org, bhupesh.linux@gmail.com, bhupesh.sharma@linaro.org, robh+dt@kernel.org, devicetree@vger.kernel.org, Marijn Suijten Subject: [PATCH v2] arm64: dts: qcom: sm6115: Move SDHC node(s)'s 'pinctrl' properties to dts Date: Tue, 14 Mar 2023 13:10:01 +0530 Message-Id: <20230314074001.1873781-1-bhupesh.sharma@linaro.org> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760328070727751000?= X-GMAIL-MSGID: =?utf-8?q?1760328070727751000?= Normally the 'pinctrl' properties of a SDHC controller and the chip detect pin settings are dependent on the type of the slots (for e.g uSD card slot), regulators and GPIO(s) available on the board(s). So, move the same from the sm6115 dtsi file to the respective board file(s). Reviewed-by: Marijn Suijten Signed-off-by: Bhupesh Sharma --- Changes since v1: - v1 can be seen here: https://lore.kernel.org/linux-arm-msm/20221220113616.1556097-1-bhupesh.sharma@linaro.org/ - Colleted the R-B from Marijn. - Rebased on linux-next/master .../boot/dts/qcom/sm4250-oneplus-billie2.dts | 10 +++++++++ arch/arm64/boot/dts/qcom/sm6115.dtsi | 22 ------------------- 2 files changed, 10 insertions(+), 22 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm4250-oneplus-billie2.dts b/arch/arm64/boot/dts/qcom/sm4250-oneplus-billie2.dts index a3f1c7c41fd73..329eb496bbc5f 100644 --- a/arch/arm64/boot/dts/qcom/sm4250-oneplus-billie2.dts +++ b/arch/arm64/boot/dts/qcom/sm4250-oneplus-billie2.dts @@ -202,12 +202,22 @@ &sdhc_2 { vqmmc-supply = <&vreg_l5a>; cd-gpios = <&tlmm 88 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&sdc2_state_on &sdc2_card_det_n>; + pinctrl-1 = <&sdc2_state_off &sdc2_card_det_n>; status = "okay"; }; &tlmm { gpio-reserved-ranges = <14 4>; + + sdc2_card_det_n: sd-card-det-n-state { + pins = "gpio88"; + function = "gpio"; + drive-strength = <2>; + bias-pull-up; + }; }; &ufs_mem_hc { diff --git a/arch/arm64/boot/dts/qcom/sm6115.dtsi b/arch/arm64/boot/dts/qcom/sm6115.dtsi index fbd67d2c8d781..e8e5f2cafebb9 100644 --- a/arch/arm64/boot/dts/qcom/sm6115.dtsi +++ b/arch/arm64/boot/dts/qcom/sm6115.dtsi @@ -595,13 +595,6 @@ data-pins { bias-pull-up; drive-strength = <10>; }; - - sd-cd-pins { - pins = "gpio88"; - function = "gpio"; - bias-pull-up; - drive-strength = <2>; - }; }; sdc2_state_off: sdc2-off-state { @@ -622,13 +615,6 @@ data-pins { bias-pull-up; drive-strength = <2>; }; - - sd-cd-pins { - pins = "gpio88"; - function = "gpio"; - bias-disable; - drive-strength = <2>; - }; }; }; @@ -731,10 +717,6 @@ sdhc_1: mmc@4744000 { <&gcc GCC_SDCC1_ICE_CORE_CLK>; clock-names = "iface", "core", "xo", "ice"; - pinctrl-0 = <&sdc1_state_on>; - pinctrl-1 = <&sdc1_state_off>; - pinctrl-names = "default", "sleep"; - bus-width = <8>; status = "disabled"; }; @@ -753,10 +735,6 @@ sdhc_2: mmc@4784000 { <&rpmcc RPM_SMD_XO_CLK_SRC>; clock-names = "iface", "core", "xo"; - pinctrl-0 = <&sdc2_state_on>; - pinctrl-1 = <&sdc2_state_off>; - pinctrl-names = "default", "sleep"; - power-domains = <&rpmpd SM6115_VDDCX>; operating-points-v2 = <&sdhc2_opp_table>; iommus = <&apps_smmu 0x00a0 0x0>;