From patchwork Fri May 21 21:58:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sujit Kautkar X-Patchwork-Id: 12273859 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E6F94C4707A for ; Fri, 21 May 2021 22:00:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BCE2B613F7 for ; Fri, 21 May 2021 22:00:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229693AbhEUWBX (ORCPT ); Fri, 21 May 2021 18:01:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59204 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229613AbhEUWBX (ORCPT ); Fri, 21 May 2021 18:01:23 -0400 Received: from mail-pg1-x52b.google.com (mail-pg1-x52b.google.com [IPv6:2607:f8b0:4864:20::52b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 90752C061574 for ; Fri, 21 May 2021 14:59:59 -0700 (PDT) Received: by mail-pg1-x52b.google.com with SMTP id v14so12562409pgi.6 for ; Fri, 21 May 2021 14:59:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=a5OnOgOOmWpMxKvaJfHdYnxsVHFmf/RGX8LXSt1tTYI=; b=QsemvWtvaAVUPew3IHPYLY11CPb8ipFmb6oOvD/sjkrcvdnEl/q+r98ITP2gQ8WujF JWYiSc2g4yGPbVRkO11usYX6ynylrCOijGH9eD9M+MawnNyueBzgXC60au4xUwnLYfpK tUfY5AEC9T33rCel6vpRoOvO5jn3eHvVdcK9c= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=a5OnOgOOmWpMxKvaJfHdYnxsVHFmf/RGX8LXSt1tTYI=; b=j66QnQJLQFZqVftm1+qnzpoHDMtkoXqbBdd02wdS7vnALNf9ZeDnl6QE3z0AWpdaM/ +NHLlKtFmwDn+wLX5f0YYn8MDN8jcLLTy6Czlq8xzoqmRLvUOIsOIMhFCI/ofHUKG1bN 1tJ+5IhvC/4OoS8ucV/I8dSU6fUfeDL6iOQYXjO1B/ELhQ6YetzNG1yvr38NAo7d9kEz 25KTc+kees5SK54UEDWmVWWMI9s2tYmMuVddTu/dVqp9aWGP6SEtzhJiuUOJFVvbf5C3 nX0vBdoWu4Q7C7Qp7oR8tDDEXDB0tCySvEboRtK0cLk0U8JgwDrgrJk9M2pMWIxFy0vE jpvw== X-Gm-Message-State: AOAM531YKu3kWousc9ut/CsPqlQcyHOKhQGfA7WGAsSbj8JsJHIgjudL k9ymAOO3StI0dNGNLOQ94KaPujKPY7ZqzQ== X-Google-Smtp-Source: ABdhPJy1wX0IIztVh3UB/sVZQXtLZrQzqNk7XiYWYOIQqGKZadHcvBhWlOZrQbsK3X/dDCg1CS0uEw== X-Received: by 2002:aa7:88d6:0:b029:2e3:b74b:2a5b with SMTP id k22-20020aa788d60000b02902e3b74b2a5bmr9160641pff.4.1621634399153; Fri, 21 May 2021 14:59:59 -0700 (PDT) Received: from sujitka-glaptop.hsd1.ca.comcast.net ([2601:646:8e00:b2f0:22bd:8c3f:584d:d265]) by smtp.gmail.com with ESMTPSA id h8sm4590835pfv.60.2021.05.21.14.59.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 May 2021 14:59:58 -0700 (PDT) From: Sujit Kautkar To: Andy Gross , Bjorn Andersson , Rob Herring Cc: Doug Anderson , Rajendra Nayak , Sibi Sankar , Sujit Kautkar , Mark Rutland , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/2] arm64: dts: qcom: sc7180: Move sdc pinconf to board specific DT files Date: Fri, 21 May 2021 14:58:42 -0700 Message-Id: <20210521145824.v2.1.Ia83c80aec3b9535f01441247b6c3fb6f80b0ec7f@changeid> X-Mailer: git-send-email 2.31.1.818.g46aad6cb9e-goog In-Reply-To: <20210521215841.2017349-1-sujitka@chromium.org> References: <20210521215841.2017349-1-sujitka@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Move sdc1/sdc2 pinconf from SoC specific DT file to board specific DT files Signed-off-by: Sujit Kautkar Reviewed-by: Douglas Anderson --- (no changes since v1) arch/arm64/boot/dts/qcom/sc7180-idp.dts | 102 +++++++++++++++++++ arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 102 +++++++++++++++++++ arch/arm64/boot/dts/qcom/sc7180.dtsi | 102 ------------------- 3 files changed, 204 insertions(+), 102 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7180-idp.dts b/arch/arm64/boot/dts/qcom/sc7180-idp.dts index e77a7926034a7..07133e0af581a 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-idp.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-idp.dts @@ -598,4 +598,106 @@ pinconf-rx { bias-pull-up; }; }; + + sdc1_on: sdc1-on { + pinconf-clk { + pins = "sdc1_clk"; + bias-disable; + drive-strength = <16>; + }; + + pinconf-cmd { + pins = "sdc1_cmd"; + bias-pull-up; + drive-strength = <10>; + }; + + pinconf-data { + pins = "sdc1_data"; + bias-pull-up; + drive-strength = <10>; + }; + + pinconf-rclk { + pins = "sdc1_rclk"; + bias-pull-down; + }; + }; + + sdc1_off: sdc1-off { + pinconf-clk { + pins = "sdc1_clk"; + bias-disable; + drive-strength = <2>; + }; + + pinconf-cmd { + pins = "sdc1_cmd"; + bias-pull-up; + drive-strength = <2>; + }; + + pinconf-data { + pins = "sdc1_data"; + bias-pull-up; + drive-strength = <2>; + }; + + pinconf-rclk { + pins = "sdc1_rclk"; + bias-pull-down; + }; + }; + + sdc2_on: sdc2-on { + pinconf-clk { + pins = "sdc2_clk"; + bias-disable; + drive-strength = <16>; + }; + + pinconf-cmd { + pins = "sdc2_cmd"; + bias-pull-up; + drive-strength = <10>; + }; + + pinconf-data { + pins = "sdc2_data"; + bias-pull-up; + drive-strength = <10>; + }; + + pinconf-sd-cd { + pins = "gpio69"; + bias-pull-up; + drive-strength = <2>; + }; + }; + + sdc2_off: sdc2-off { + pinconf-clk { + pins = "sdc2_clk"; + bias-disable; + drive-strength = <2>; + }; + + pinconf-cmd { + pins = "sdc2_cmd"; + bias-pull-up; + drive-strength = <2>; + }; + + pinconf-data { + pins = "sdc2_data"; + bias-pull-up; + drive-strength = <2>; + }; + + pinconf-sd-cd { + pins = "gpio69"; + bias-disable; + drive-strength = <2>; + }; + }; }; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi index 609f0ceafd095..d128a0ed6ad3a 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi @@ -1540,4 +1540,106 @@ pinconf { drive-strength = <2>; }; }; + + sdc1_on: sdc1-on { + pinconf-clk { + pins = "sdc1_clk"; + bias-disable; + drive-strength = <16>; + }; + + pinconf-cmd { + pins = "sdc1_cmd"; + bias-pull-up; + drive-strength = <10>; + }; + + pinconf-data { + pins = "sdc1_data"; + bias-pull-up; + drive-strength = <10>; + }; + + pinconf-rclk { + pins = "sdc1_rclk"; + bias-pull-down; + }; + }; + + sdc1_off: sdc1-off { + pinconf-clk { + pins = "sdc1_clk"; + bias-disable; + drive-strength = <2>; + }; + + pinconf-cmd { + pins = "sdc1_cmd"; + bias-pull-up; + drive-strength = <2>; + }; + + pinconf-data { + pins = "sdc1_data"; + bias-pull-up; + drive-strength = <2>; + }; + + pinconf-rclk { + pins = "sdc1_rclk"; + bias-pull-down; + }; + }; + + sdc2_on: sdc2-on { + pinconf-clk { + pins = "sdc2_clk"; + bias-disable; + drive-strength = <16>; + }; + + pinconf-cmd { + pins = "sdc2_cmd"; + bias-pull-up; + drive-strength = <10>; + }; + + pinconf-data { + pins = "sdc2_data"; + bias-pull-up; + drive-strength = <10>; + }; + + pinconf-sd-cd { + pins = "gpio69"; + bias-pull-up; + drive-strength = <2>; + }; + }; + + sdc2_off: sdc2-off { + pinconf-clk { + pins = "sdc2_clk"; + bias-disable; + drive-strength = <2>; + }; + + pinconf-cmd { + pins = "sdc2_cmd"; + bias-pull-up; + drive-strength = <2>; + }; + + pinconf-data { + pins = "sdc2_data"; + bias-pull-up; + drive-strength = <2>; + }; + + pinconf-sd-cd { + pins = "gpio69"; + bias-disable; + drive-strength = <2>; + }; + }; }; diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi index 1fc328ba0403e..0630a9c410b58 100644 --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi @@ -1872,108 +1872,6 @@ pinmux { function = "lpass_ext"; }; }; - - sdc1_on: sdc1-on { - pinconf-clk { - pins = "sdc1_clk"; - bias-disable; - drive-strength = <16>; - }; - - pinconf-cmd { - pins = "sdc1_cmd"; - bias-pull-up; - drive-strength = <10>; - }; - - pinconf-data { - pins = "sdc1_data"; - bias-pull-up; - drive-strength = <10>; - }; - - pinconf-rclk { - pins = "sdc1_rclk"; - bias-pull-down; - }; - }; - - sdc1_off: sdc1-off { - pinconf-clk { - pins = "sdc1_clk"; - bias-disable; - drive-strength = <2>; - }; - - pinconf-cmd { - pins = "sdc1_cmd"; - bias-pull-up; - drive-strength = <2>; - }; - - pinconf-data { - pins = "sdc1_data"; - bias-pull-up; - drive-strength = <2>; - }; - - pinconf-rclk { - pins = "sdc1_rclk"; - bias-pull-down; - }; - }; - - sdc2_on: sdc2-on { - pinconf-clk { - pins = "sdc2_clk"; - bias-disable; - drive-strength = <16>; - }; - - pinconf-cmd { - pins = "sdc2_cmd"; - bias-pull-up; - drive-strength = <10>; - }; - - pinconf-data { - pins = "sdc2_data"; - bias-pull-up; - drive-strength = <10>; - }; - - pinconf-sd-cd { - pins = "gpio69"; - bias-pull-up; - drive-strength = <2>; - }; - }; - - sdc2_off: sdc2-off { - pinconf-clk { - pins = "sdc2_clk"; - bias-disable; - drive-strength = <2>; - }; - - pinconf-cmd { - pins = "sdc2_cmd"; - bias-pull-up; - drive-strength = <2>; - }; - - pinconf-data { - pins = "sdc2_data"; - bias-pull-up; - drive-strength = <2>; - }; - - pinconf-sd-cd { - pins = "gpio69"; - bias-disable; - drive-strength = <2>; - }; - }; }; remoteproc_mpss: remoteproc@4080000 { From patchwork Fri May 21 21:58:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sujit Kautkar X-Patchwork-Id: 12273861 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2B005C04FF3 for ; Fri, 21 May 2021 22:00:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 066CA613F7 for ; Fri, 21 May 2021 22:00:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229668AbhEUWBu (ORCPT ); Fri, 21 May 2021 18:01:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59338 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229503AbhEUWBu (ORCPT ); Fri, 21 May 2021 18:01:50 -0400 Received: from mail-pg1-x532.google.com (mail-pg1-x532.google.com [IPv6:2607:f8b0:4864:20::532]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CB556C0613ED for ; Fri, 21 May 2021 15:00:26 -0700 (PDT) Received: by mail-pg1-x532.google.com with SMTP id 27so13979838pgy.3 for ; Fri, 21 May 2021 15:00:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=U2V7fmw/fmgZiVcO3AfU6PNyi6PWDJ3vPw52uwZKHWA=; b=RI8V3dwaAwJhbjkfHkPgO2ZyS3w4TIW3vYIgNDAwxZydDtq0dIM5c8IOph2dJvSeDH FhDuNkvWfIgu4S32nM52ZXTv/mgAdzugTo9aYEUbVTx9t7RLLqdUYQFKsAQg7fQXR6pO I0f8YvXuCQdmCu1Kzp8rcdEmAWRNnHqU4M0ms= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=U2V7fmw/fmgZiVcO3AfU6PNyi6PWDJ3vPw52uwZKHWA=; b=kcsbNW9B1bLpUEK65VhqaI2zxCMZiTfe8o/0h8ZA4fXIBYGT62NKkmktmGU8yHr60c wTNy4/6Y9sHkadQskPFj++P4yny6MHPTEg7VbHZLiCQ1YJdV1fFfe5TDHE0RwTEZ8H6/ rIC4FXx35OgchYq77QKSJyAG+70IxRh26C+qSg3RI08BMsPoZ3B9vN+gFVIa0BUTgXuo B8K1MJZvhJWgQS48LFPF/XR5d1UB2jNnfK0ip9LnUMDBPe0KpFRpFjXfexbtGlJFbWEY b2IbH+YiIF6TOIIV4GIKLto4m28PX7hk/f9FpXvbzChD17DBzzOaqup2Yo7JWVziu1DA 6yYw== X-Gm-Message-State: AOAM530sX0+ZgUthC7la2mFw3zxWHZY9mOi7alEJVLYPSia7EUF+3SDj 68eBnL94591Riz6R1Ze3C3hzjg== X-Google-Smtp-Source: ABdhPJwFzwge0QTObIl3lZKYxTMVYg/MyrzPrxuxYe/7+wxEWHelKB6+Rkxq5iqFRSCJz+LG7fOx6Q== X-Received: by 2002:aa7:8f37:0:b029:2db:551f:ed8e with SMTP id y23-20020aa78f370000b02902db551fed8emr12017972pfr.43.1621634426412; Fri, 21 May 2021 15:00:26 -0700 (PDT) Received: from sujitka-glaptop.hsd1.ca.comcast.net ([2601:646:8e00:b2f0:22bd:8c3f:584d:d265]) by smtp.gmail.com with ESMTPSA id h8sm4590835pfv.60.2021.05.21.15.00.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 May 2021 15:00:25 -0700 (PDT) From: Sujit Kautkar To: Andy Gross , Bjorn Andersson , Rob Herring Cc: Doug Anderson , Rajendra Nayak , Sibi Sankar , Sujit Kautkar , Mark Rutland , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/2] arm64: dts: qcom: sc7180: trogdor: SD-card GPIO pin set bias-pull up Date: Fri, 21 May 2021 14:58:44 -0700 Message-Id: <20210521145824.v2.2.I52f30ddfe62041b7e6c3c362f0ad8f695ac28224@changeid> X-Mailer: git-send-email 2.31.1.818.g46aad6cb9e-goog In-Reply-To: <20210521215841.2017349-1-sujitka@chromium.org> References: <20210521215841.2017349-1-sujitka@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Trogdor board does not have external pull-up for cd-gpio. Set this pin to internal pull-up for sleep config to avoid frequent regulator toggle events. This change is aligned with Qualcomm's DT change posted at: https://patchwork.kernel.org/patch/11675347/ Signed-off-by: Sujit Kautkar Reviewed-by: Douglas Anderson --- Changes in v2: - added pull-up for IDP (no changes since v1) arch/arm64/boot/dts/qcom/sc7180-idp.dts | 2 +- arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7180-idp.dts b/arch/arm64/boot/dts/qcom/sc7180-idp.dts index 07133e0af581a..0c255edb7f3c3 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-idp.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-idp.dts @@ -696,7 +696,7 @@ pinconf-data { pinconf-sd-cd { pins = "gpio69"; - bias-disable; + bias-pull-up; drive-strength = <2>; }; }; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi index d128a0ed6ad3a..330deb4967ca2 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi @@ -1638,7 +1638,7 @@ pinconf-data { pinconf-sd-cd { pins = "gpio69"; - bias-disable; + bias-pull-up; drive-strength = <2>; }; };