From patchwork Tue Dec 20 11:36:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhupesh Sharma X-Patchwork-Id: 35043 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp2914233wrn; Tue, 20 Dec 2022 03:38:15 -0800 (PST) X-Google-Smtp-Source: AA0mqf6fjFuqWshX09SRuakK7BJv+28Ol4kQv6SRxGzba8vSA6j1ah9OwNSiofSm5QhQUQN2ncHU X-Received: by 2002:aa7:c614:0:b0:46c:ab70:c009 with SMTP id h20-20020aa7c614000000b0046cab70c009mr38120032edq.27.1671536295052; Tue, 20 Dec 2022 03:38:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671536295; cv=none; d=google.com; s=arc-20160816; b=PNrXi9Cjf8t6JKnVCGrU1omrS+A1bkJLFi8X2cjHQ7wWc5ZdagNSNrfKKLVc/RC1Y4 ew4Rso9YlqbHrjMh5iN2QmpctPKc28N5W0Ug6uM+Ofb1WQKgEKEvT+NPQCQODcaFl4ik GmPEdWrSqr8x4fSb/pnBvWDGNPicnPMn9iRWe5vjuxCY7abNB8bcP8JMuZe15wkeuFdb IAhwdSIQu6txBTJtbDBEo/rbPwSjPrghv04DmVsdL8D7VfVgoWDYVR5pBoaP66UPsSUt 22v0XPb9JyXBjhw7SCR/XHx05Ac62jFk/GG/FDJ4dX1Sq9gpZbjBcbD+acxg61FvoWok Nx0w== 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=huPxZPVrtYAVsJ7rw0Hki2j64FcdxEjWj9SNeXSzqOo=; b=SYYwwXyF6uxxoR6yHbNlrxnoGifCEr6AOESU9bARCy4oHSuA/pLtJ8mkDP180qhgBC fNt5pEwKR/xxK4TJ8t5LYbKM0/lxGS938ZHbUywEf+lzf+5ydV5Z5LVbhWPXfyeW4M2c WAQcsbmww1cfT++y8ZwaHlluxeAsz8LIgUReELQxJuUTRdpWv3e/cTmS5mYT9KleIaJU WLNTb+pVQ0G1ZOAKc76ZecY41TG2lnrIk+FaRH/RkcIBpdpml8NyOHmoSM783P3n4Rxi aPDoM7q1LoFkjj91pAYZ35kRTK8o4bMCdYNfE521acyD9B+omj2kL99PpCErlQLZoz3S l6Qw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="ryhiP/QK"; 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 h20-20020a0564020e9400b00461ebe2a168si10382539eda.447.2022.12.20.03.37.51; Tue, 20 Dec 2022 03:38:15 -0800 (PST) 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="ryhiP/QK"; 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 S231371AbiLTLga (ORCPT + 99 others); Tue, 20 Dec 2022 06:36:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50142 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231470AbiLTLg2 (ORCPT ); Tue, 20 Dec 2022 06:36:28 -0500 Received: from mail-pl1-x629.google.com (mail-pl1-x629.google.com [IPv6:2607:f8b0:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8D56638BE for ; Tue, 20 Dec 2022 03:36:26 -0800 (PST) Received: by mail-pl1-x629.google.com with SMTP id u7so3788655plq.11 for ; Tue, 20 Dec 2022 03:36:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=huPxZPVrtYAVsJ7rw0Hki2j64FcdxEjWj9SNeXSzqOo=; b=ryhiP/QKYwum0vMOPDx3DBCfrT0z+eenok3UsR4qSLWNXs2yVHPv9ZBrMqlxN3NQx5 UVGtqXMqAJdbYMXRZV8TtkvCgO2nPnJR0nrG073Gl9hk1vXDHOYAVloKOf7xZfWSFTKJ LlxIO8ruht2HspcqOJ8C/WAeZzK4oZ3TYmthan6NlhXwfc079Skw1ZgUa/9DxEfY8l0S LN3kfCMB7V2Y0/4CDXtlkIYCFpRoFZGt+5BfkMkzh9IT+UceoY1vDEr30tntSo0PEdmj mwqu6mw77z6fWppCX6KALWptNAn+Mkpx4iwPAiImORvGcyHZSxEqQaVOIIdrCS8LyiQL go9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=huPxZPVrtYAVsJ7rw0Hki2j64FcdxEjWj9SNeXSzqOo=; b=yi4SPmUYF0AGiFNnhn60kSC9ZD9BBSvZFauIys4jj45NtLMHB6i4hVc+jGxaoWkF3b S4OYxSDGbZ0lM0FUHFHC4zNF6MKT5LM4Qfl4rQTMnOet7ajwPlleA71R5v5sEvAXlrmx Ki9sVA/lYj6jlDUj7dyd44G+KxZyi9SqsoVbneWBHzhuiDnnDj2PufCLjWOEQJvYZvS7 U2c2XwnVJNqixtvcie5ZvKjdQG3OjTDgWHHK9fcr/ohSK2/An3aOgJ46FNFGedaMF/rD UT3wI0kwWmaNfWVS2u3mG3Dy2uzMCFbB4rJnzcmqmo7B0gLTnKEOfpuqe5WPOJeG3+8F bvgw== X-Gm-Message-State: AFqh2kquE/W9UNT1xx0b1vzOuPZPOcvAO7AFlcjOYAnth/SqZ6Xp3tRR sl+840vFggOekxAkZKEcvSpgcg== X-Received: by 2002:a05:6a21:e30d:b0:af:dbe9:4466 with SMTP id cb13-20020a056a21e30d00b000afdbe94466mr21194232pzc.31.1671536185989; Tue, 20 Dec 2022 03:36:25 -0800 (PST) Received: from localhost.localdomain ([2401:4900:1c5f:178a:c141:ef5d:9a2d:26ec]) by smtp.gmail.com with ESMTPSA id q20-20020a631f54000000b00476c2180dbcsm7903139pgm.29.2022.12.20.03.36.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Dec 2022 03:36:25 -0800 (PST) From: Bhupesh Sharma To: linux-arm-msm@vger.kernel.org Cc: devicetree@vger.kernel.org, agross@kernel.org, bhupesh.sharma@linaro.org, bhupesh.linux@gmail.com, linux-kernel@vger.kernel.org, robh+dt@kernel.org, krzysztof.kozlowski@linaro.org, konrad.dybcio@linaro.org, andersson@kernel.org Subject: [PATCH] arm64: dts: qcom: sm6115: Move SDHC node(s)'s 'pinctrl' properties to dts Date: Tue, 20 Dec 2022 17:06:16 +0530 Message-Id: <20221220113616.1556097-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 autolearn=ham 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?1752732842263394261?= X-GMAIL-MSGID: =?utf-8?q?1752732842263394261?= 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). Signed-off-by: Bhupesh Sharma Reviewed-by: Marijn Suijten --- .../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 572bf04adf906..6be763d39870d 100644 --- a/arch/arm64/boot/dts/qcom/sm6115.dtsi +++ b/arch/arm64/boot/dts/qcom/sm6115.dtsi @@ -518,13 +518,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 { @@ -545,13 +538,6 @@ data-pins { bias-pull-up; drive-strength = <2>; }; - - sd-cd-pins { - pins = "gpio88"; - function = "gpio"; - bias-disable; - drive-strength = <2>; - }; }; }; @@ -652,10 +638,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"; }; @@ -672,10 +654,6 @@ sdhc_2: mmc@4784000 { clocks = <&gcc GCC_SDCC2_AHB_CLK>, <&gcc GCC_SDCC2_APPS_CLK>, <&xo_board>; 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>;