From patchwork Fri May 21 20:05:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sujit Kautkar X-Patchwork-Id: 12273671 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 86653C47080 for ; Fri, 21 May 2021 20:06:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6873C6140E for ; Fri, 21 May 2021 20:06:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232413AbhEUUHd (ORCPT ); Fri, 21 May 2021 16:07:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33246 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232287AbhEUUHb (ORCPT ); Fri, 21 May 2021 16:07:31 -0400 Received: from mail-pl1-x631.google.com (mail-pl1-x631.google.com [IPv6:2607:f8b0:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 129D6C0613ED for ; Fri, 21 May 2021 13:06:08 -0700 (PDT) Received: by mail-pl1-x631.google.com with SMTP id v12so11550937plo.10 for ; Fri, 21 May 2021 13:06:08 -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=Wf4wk2hYKZvYoiak2ddgb48a4NAmsAjej7Py46r9Ndw=; b=SWFLUKUDqsL879uRmUAJcZGM4rX9s/upJwg7OtUTR++1RtrJoh2Rtytxd/Mza3BOVF M9fcW4v0D9NMuJ5dv4QlMzEz39J0iOWToEvQy+rB3s4Mvay85v1SO3jwm34TJPiGtbvo YgoaYQEfHgCLp5mzNV8RI5kp51POiRo+nwmT8= 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=Wf4wk2hYKZvYoiak2ddgb48a4NAmsAjej7Py46r9Ndw=; b=U4BfFe1X52mdj6+7dMron1hHbXvm71jlAUmecS0KK6Edqy6LYOE/XzcHL0AOWcnkST G5sGwDZhLeVWddf6vDZ7RDaby3FCTSSCxlknV6fwJCgnrovCjpTnsIxn/sBotwk9uUZ/ VMCk9WVub9O/q9rR+JvIW5VDG0wxmNTlDuS7bvN8PC5Qs5Avdukpa7ZES2u3JXrPsy1n HbMNJLp/f5Elwyvu1t1XUVw2RpgtgSpqZhKuynVBGZhnUlJsJiMzYMGvbD1fMhyFEdMf v86n0CCOsVekbaNmjZDC/O9ITU4MOFl/rxnkKbgvizWVINQ9NjWvVpO8YvG5WrgQt3yW 2BWw== X-Gm-Message-State: AOAM530WsCnJ7IbRRC6kiVdslAxv/jctUvzHiiKxayYepfMywge+Zlz8 bmEPJXf2cJ0JtxGxn+cW5L5GvA== X-Google-Smtp-Source: ABdhPJzqAo86oQgd0Ds5xJnUcYsOwQOzn37NNIOsZ2bZoQwT+p5lCuJQmmUvtj9qFmenGAYW385AoA== X-Received: by 2002:a17:902:7407:b029:f0:dace:a5a9 with SMTP id g7-20020a1709027407b02900f0dacea5a9mr13595274pll.34.1621627567547; Fri, 21 May 2021 13:06:07 -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 z19sm4550614pjn.0.2021.05.21.13.06.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 May 2021 13:06:06 -0700 (PDT) From: Sujit Kautkar To: Andy Gross , Bjorn Andersson , Rob Herring Cc: Sibi Sankar , Doug Anderson , Rajendra Nayak , Sujit Kautkar , Mark Rutland , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 1/2] arm64: dts: qcom: sc7180: Move sdc pinconf to board specific DT files Date: Fri, 21 May 2021 13:05:28 -0700 Message-Id: <20210521130511.v1.1.Ia83c80aec3b9535f01441247b6c3fb6f80b0ec7f@changeid> X-Mailer: git-send-email 2.31.1.818.g46aad6cb9e-goog In-Reply-To: <20210521200529.1991729-1-sujitka@chromium.org> References: <20210521200529.1991729-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 --- 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 20:05:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sujit Kautkar X-Patchwork-Id: 12273673 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 87C6AC4707A for ; Fri, 21 May 2021 20:06:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6AA22613E1 for ; Fri, 21 May 2021 20:06:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232699AbhEUUHg (ORCPT ); Fri, 21 May 2021 16:07:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33270 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232597AbhEUUHe (ORCPT ); Fri, 21 May 2021 16:07:34 -0400 Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 27741C06138A for ; Fri, 21 May 2021 13:06:11 -0700 (PDT) Received: by mail-pl1-x62c.google.com with SMTP id e15so4933924plh.1 for ; Fri, 21 May 2021 13:06:11 -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=H+EzPeqojY+93vhWBpwnSXdlNpKsgPbELWuAjK3Y1rE=; b=ZKsR/+AaHphumaUwqUjftBqQdZqI0fzRobWZ89qGnV4MsIOLuKgdPwcj4rFcxggq4g jXLviS+mwisd5u8tm5ff1KmYPgd7yeqwP5quL6XcMjPQGuoBiIU2QAnOD70t1FBmAiTz 1k1BTysLubdKWE54yPxyxqIru7BueK4OI/B7A= 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=H+EzPeqojY+93vhWBpwnSXdlNpKsgPbELWuAjK3Y1rE=; b=g0ytKs1aRfqAnpVQI9t2Dnu/ArDNjC79EsvzZ3mFX2Cyh4z/qP9kGvHXEDOgBzQBAD S7ILL320cz9YI7NPeRT71n8GKCJTg8B3SvO3DgM3RJv+El7qQxBSMrbzPBycTKjmZ3zq XWcR6YXyTeqI72QT9kNySx3afsE6k12B8r/F8AUSdi0FHJUD6LlZoDHtGTrSPlgZM/mH 6rBU40vNeCmygujkzaD/TMJcywCdGfOqGeLtiGTPtRYpouKLv/DYvyk3Frc4mIGjXxaU ls0VUHJ9kix4GR+pO+YGumcjqwUWl6nWiultvyYWvWaa/7+HvZ+ZJ9KsXXVCBn5v3Wy/ hyMQ== X-Gm-Message-State: AOAM530E/vnxFvUbrUIdy2rRfJI6I4QrOKRX18C9dnJnn3Z/OtKyruzQ G5GJteGO+nfPaAcYPqRvVnK1qQ== X-Google-Smtp-Source: ABdhPJysX2rMH4lavP2VsfLuOs5VOzf6pzH8FUyZzMjCMiAkn90xzeiXrvFoo1P5k6r8OnEA7EDUVg== X-Received: by 2002:a17:902:f704:b029:f4:228d:4dca with SMTP id h4-20020a170902f704b02900f4228d4dcamr14024654plo.26.1621627570751; Fri, 21 May 2021 13:06:10 -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 z19sm4550614pjn.0.2021.05.21.13.06.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 May 2021 13:06:10 -0700 (PDT) From: Sujit Kautkar To: Andy Gross , Bjorn Andersson , Rob Herring Cc: Sibi Sankar , Doug Anderson , Rajendra Nayak , Sujit Kautkar , Mark Rutland , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 2/2] arm64: dts: qcom: sc7180: trogdor: SD-card GPIO pin set bias-pull up Date: Fri, 21 May 2021 13:05:29 -0700 Message-Id: <20210521130511.v1.2.I52f30ddfe62041b7e6c3c362f0ad8f695ac28224@changeid> X-Mailer: git-send-email 2.31.1.818.g46aad6cb9e-goog In-Reply-To: <20210521200529.1991729-1-sujitka@chromium.org> References: <20210521200529.1991729-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 --- arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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>; }; };