linux-arm-msm.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Douglas Anderson <dianders@chromium.org>
To: Bjorn Andersson <bjorn.andersson@linaro.org>
Cc: Stephen Boyd <swboyd@chromium.org>,
	Alexandru M Stan <amstan@chromium.org>,
	Matthias Kaehlcke <mka@chromium.org>,
	Rob Clark <robdclark@chromium.org>,
	Douglas Anderson <dianders@chromium.org>,
	V Sujith Kumar Reddy <vsujithk@codeaurora.org>,
	Srinivasa Rao Mandadapu <srivasam@codeaurora.org>,
	Tzung-Bi Shih <tzungbi@chromium.org>,
	Judy Hsiao <judyhsiao@chromium.org>,
	Andy Gross <agross@kernel.org>, Rob Herring <robh+dt@kernel.org>,
	devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH 02/13] arm64: dts: qcom: Move sc7180 MI2S config to board files and make pulldown
Date: Thu, 25 Feb 2021 14:12:59 -0800	[thread overview]
Message-ID: <20210225141022.2.Id27e7e6f90c29bf623fa4880e18a14ba1dffd2d2@changeid> (raw)
In-Reply-To: <20210225221310.1939599-1-dianders@chromium.org>

In general pinconf belongs in board files, not SoC files.  Move it to
the only current user (trogdor).  Also adjust the drive strengths and
pulls.

Cc: V Sujith Kumar Reddy <vsujithk@codeaurora.org>
Cc: Srinivasa Rao Mandadapu <srivasam@codeaurora.org>
Cc: Tzung-Bi Shih <tzungbi@chromium.org>
Cc: Judy Hsiao <judyhsiao@chromium.org>
Signed-off-by: Douglas Anderson <dianders@chromium.org>
---
This should replace the patch ("Asoc: qcom: dts: Change MI2S GPIO
configuration to pulldown") [1].

[1] https://lore.kernel.org/r/1605526408-15671-1-git-send-email-srivasam@codeaurora.org

 arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 24 ++++++++++++++++++++
 arch/arm64/boot/dts/qcom/sc7180.dtsi         | 18 ---------------
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
index 07c8b2c926c0..25ab6572f9cf 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
@@ -875,6 +875,22 @@ pinconf {
 	};
 };
 
+&pri_mi2s_active {
+	pinconf {
+		pins = "gpio53", "gpio54", "gpio55", "gpio56";
+		drive-strength = <2>;
+		bias-pull-down;
+	};
+};
+
+&pri_mi2s_mclk_active {
+	pinconf {
+		pins = "gpio57";
+		drive-strength = <2>;
+		bias-pull-down;
+	};
+};
+
 &qspi_cs0 {
 	pinconf {
 		pins = "gpio68";
@@ -1015,6 +1031,14 @@ pinconf-rx {
 	};
 };
 
+&sec_mi2s_active {
+	pinconf {
+		pins = "gpio49", "gpio50", "gpio51";
+		drive-strength = <2>;
+		bias-pull-down;
+	};
+};
+
 /* PINCTRL - board-specific pinctrl */
 
 &pm6150_gpio {
diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi
index 60248a6757d8..5040923a9f7c 100644
--- a/arch/arm64/boot/dts/qcom/sc7180.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi
@@ -1856,12 +1856,6 @@ pinmux {
 					pins = "gpio49", "gpio50", "gpio51";
 					function = "mi2s_1";
 				};
-
-				pinconf {
-					pins = "gpio49", "gpio50", "gpio51";
-					drive-strength = <8>;
-					bias-pull-up;
-				};
 			};
 
 			pri_mi2s_active: pri-mi2s-active {
@@ -1869,12 +1863,6 @@ pinmux {
 					pins = "gpio53", "gpio54", "gpio55", "gpio56";
 					function = "mi2s_0";
 				};
-
-				pinconf {
-					pins = "gpio53", "gpio54", "gpio55", "gpio56";
-					drive-strength = <8>;
-					bias-pull-up;
-				};
 			};
 
 			pri_mi2s_mclk_active: pri-mi2s-mclk-active {
@@ -1882,12 +1870,6 @@ pinmux {
 					pins = "gpio57";
 					function = "lpass_ext";
 				};
-
-				pinconf {
-					pins = "gpio57";
-					drive-strength = <8>;
-					bias-pull-up;
-				};
 			};
 
 			sdc1_on: sdc1-on {
-- 
2.30.1.766.gb4fecdf3b7-goog


  parent reply	other threads:[~2021-02-25 22:15 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-25 22:12 [PATCH 00/13] arm64: dts: qcom: Update sc7180-trogdor variants from downstream Douglas Anderson
2021-02-25 22:12 ` [PATCH 01/13] arm64: dts: qcom: sc7180: Update dts for DP phy inside QMP phy Douglas Anderson
2021-03-14  0:28   ` Dmitry Baryshkov
2021-03-15 17:40     ` Doug Anderson
2021-02-25 22:12 ` Douglas Anderson [this message]
2021-02-25 22:55   ` [PATCH 02/13] arm64: dts: qcom: Move sc7180 MI2S config to board files and make pulldown Konrad Dybcio
2021-02-25 22:57     ` Doug Anderson
2021-02-25 23:07       ` Konrad Dybcio
2021-02-25 23:48   ` Matthias Kaehlcke
2021-02-25 22:13 ` [PATCH 03/13] arm64: dts: qcom: Prep sc7180-trogdor trackpad IRQ for new boards Douglas Anderson
2021-02-25 23:54   ` Matthias Kaehlcke
2021-02-25 22:13 ` [PATCH 04/13] arm64: dts: qcom: Unify the sc7180-trogdor panel nodes Douglas Anderson
2021-02-25 23:58   ` Matthias Kaehlcke
2021-02-25 22:13 ` [PATCH 05/13] arm64: dts: qcom: trogdor: Only wakeup from pen eject Douglas Anderson
2021-02-26  0:02   ` Matthias Kaehlcke
2021-02-25 22:13 ` [PATCH 06/13] arm64: dts: qcom: Disable camera clk on sc7180-trogdor devices by default Douglas Anderson
2021-02-26  0:06   ` Matthias Kaehlcke
2021-02-25 22:13 ` [PATCH 07/13] arm64: dts: qcom: sc7180-trogdor: Remove fp control pins in prep for coachz Douglas Anderson
2021-02-26  0:14   ` Matthias Kaehlcke
2021-02-25 22:13 ` [PATCH 08/13] arm64: dts: qcom: sc7180: Remove clock for bluetooth on Trogdor Douglas Anderson
2021-02-26  0:19   ` Matthias Kaehlcke
2021-02-25 22:13 ` [PATCH 09/13] arm64: dts: qcom: sc7180: add GO_LAZOR variant property for lazor Douglas Anderson
2021-02-26  0:25   ` Matthias Kaehlcke
2021-02-25 22:13 ` [PATCH 10/13] arm64: dts: qcom: sc7180: Set up lazor r3+ as sc7180-lite SKUs Douglas Anderson
2021-02-25 22:13 ` [PATCH 11/13] arm64: dts: qcom: Add sc7180-lazor-limozeen skus Douglas Anderson
2021-02-26  0:40   ` Matthias Kaehlcke
2021-02-25 22:13 ` [PATCH 12/13] arm64: dts: qcom: Add sc7180-lazor-pompom skus Douglas Anderson
2021-02-25 22:25   ` Doug Anderson
2021-02-26  2:13   ` Matthias Kaehlcke
2021-02-25 22:13 ` [PATCH 13/13] arm64: dts: qcom: Add sc7180-lazor-coachz skus Douglas Anderson
2021-02-26 17:14   ` Matthias Kaehlcke
2021-02-26 18:45   ` Stephen Boyd
2021-02-27  0:55     ` Doug Anderson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210225141022.2.Id27e7e6f90c29bf623fa4880e18a14ba1dffd2d2@changeid \
    --to=dianders@chromium.org \
    --cc=agross@kernel.org \
    --cc=amstan@chromium.org \
    --cc=bjorn.andersson@linaro.org \
    --cc=devicetree@vger.kernel.org \
    --cc=judyhsiao@chromium.org \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mka@chromium.org \
    --cc=robdclark@chromium.org \
    --cc=robh+dt@kernel.org \
    --cc=srivasam@codeaurora.org \
    --cc=swboyd@chromium.org \
    --cc=tzungbi@chromium.org \
    --cc=vsujithk@codeaurora.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).