devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Brian Masney <bmasney@redhat.com>
To: andersson@kernel.org, krzysztof.kozlowski+dt@linaro.org
Cc: konrad.dybcio@linaro.org, robh+dt@kernel.org,
	johan+linaro@kernel.org, linux-arm-msm@vger.kernel.org,
	devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
	ahalaney@redhat.com, echanude@redhat.com,
	quic_shazhuss@quicinc.com
Subject: [PATCH 1/4] arm64: dts: qcom: sc8280xp: rename i2c5 to i2c21
Date: Mon, 12 Dec 2022 13:23:11 -0500	[thread overview]
Message-ID: <20221212182314.1902632-2-bmasney@redhat.com> (raw)
In-Reply-To: <20221212182314.1902632-1-bmasney@redhat.com>

According to the downstream 5.4 kernel sources for the sa8540p,
i2c@894000 is labeled i2c bus 21, not 5. The interrupts and clocks
also match. Let's go ahead and correct the name that's used in the
three files where this is listed.

Signed-off-by: Brian Masney <bmasney@redhat.com>
Fixes: 152d1faf1e2f3 ("arm64: dts: qcom: add SC8280XP platform")
Fixes: ccd3517faf183 ("arm64: dts: qcom: sc8280xp: Add reference device")
Fixes: 32c231385ed43 ("arm64: dts: qcom: sc8280xp: add Lenovo Thinkpad X13s devicetree")
---
 arch/arm64/boot/dts/qcom/sc8280xp-crd.dts                  | 6 +++---
 arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 6 +++---
 arch/arm64/boot/dts/qcom/sc8280xp.dtsi                     | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
index 551768f97729..1ab76724144d 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
@@ -326,11 +326,11 @@ &qup2 {
 	status = "okay";
 };
 
-&qup2_i2c5 {
+&qup2_i2c21 {
 	clock-frequency = <400000>;
 
 	pinctrl-names = "default";
-	pinctrl-0 = <&qup2_i2c5_default>;
+	pinctrl-0 = <&qup2_i2c21_default>;
 
 	status = "okay";
 
@@ -598,7 +598,7 @@ qup0_i2c4_default: qup0-i2c4-default-state {
 		drive-strength = <16>;
 	};
 
-	qup2_i2c5_default: qup2-i2c5-default-state {
+	qup2_i2c21_default: qup2-i2c21-default-state {
 		pins = "gpio81", "gpio82";
 		function = "qup21";
 
diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
index 568c6be1ceaa..284adf60386a 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
@@ -531,11 +531,11 @@ &qup2 {
 	status = "okay";
 };
 
-&qup2_i2c5 {
+&qup2_i2c21 {
 	clock-frequency = <400000>;
 
 	pinctrl-names = "default";
-	pinctrl-0 = <&qup2_i2c5_default>;
+	pinctrl-0 = <&qup2_i2c21_default>;
 
 	status = "okay";
 
@@ -801,7 +801,7 @@ qup0_i2c4_default: qup0-i2c4-default-state {
 		drive-strength = <16>;
 	};
 
-	qup2_i2c5_default: qup2-i2c5-default-state {
+	qup2_i2c21_default: qup2-i2c21-default-state {
 		pins = "gpio81", "gpio82";
 		function = "qup21";
 		bias-disable;
diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
index 109c9d2b684d..875cc91324ce 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
@@ -827,7 +827,7 @@ qup2_uart17: serial@884000 {
 				status = "disabled";
 			};
 
-			qup2_i2c5: i2c@894000 {
+			qup2_i2c21: i2c@894000 {
 				compatible = "qcom,geni-i2c";
 				reg = <0 0x00894000 0 0x4000>;
 				clock-names = "se";
-- 
2.38.1


  reply	other threads:[~2022-12-12 18:25 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-12 18:23 [PATCH 0/4] arm64: dts: qcom: sc8280xp: add i2c and spi nodes Brian Masney
2022-12-12 18:23 ` Brian Masney [this message]
2022-12-12 18:48   ` [PATCH 1/4] arm64: dts: qcom: sc8280xp: rename i2c5 to i2c21 Konrad Dybcio
2022-12-13 14:54   ` Johan Hovold
2022-12-13 15:04     ` Shazad Hussain
2022-12-13 15:19       ` Johan Hovold
2022-12-13 15:05     ` Brian Masney
2022-12-13 15:12     ` Brian Masney
2022-12-13 15:28       ` Johan Hovold
2022-12-13 15:34         ` Shazad Hussain
2022-12-13 15:39           ` Johan Hovold
2022-12-13 15:42             ` Johan Hovold
2022-12-13 15:44               ` Konrad Dybcio
2022-12-13 16:15                 ` Johan Hovold
2022-12-13 15:45             ` Shazad Hussain
2022-12-13 15:17     ` Johan Hovold
2022-12-13 15:29       ` Konrad Dybcio
2022-12-13 15:32         ` Johan Hovold
2022-12-13 15:59           ` Brian Masney
2022-12-13 16:22             ` Johan Hovold
2022-12-12 18:23 ` [PATCH 2/4] arm64: dts: qcom: sc8280xp: add missing i2c nodes Brian Masney
2022-12-12 18:23 ` [PATCH 3/4] arm64: dts: qcom: sa8540p-ride: add qup1_i2c15 and qup2_i2c18 nodes Brian Masney
2022-12-13  7:18   ` Shazad Hussain
2022-12-13 14:48   ` Konrad Dybcio
2022-12-14 12:30     ` Brian Masney
2022-12-14 12:52       ` Krzysztof Kozlowski
2022-12-14 14:19         ` Brian Masney
2022-12-14 12:53       ` Konrad Dybcio
2022-12-14 15:36       ` Shazad Hussain
2022-12-14 16:24         ` Brian Masney
2022-12-13 14:59   ` Johan Hovold
2022-12-14 12:51   ` Krzysztof Kozlowski
2022-12-12 18:23 ` [PATCH 4/4] arm64: dts: qcom: sc8280xp: add missing spi nodes Brian Masney
2022-12-13  7:16   ` Shazad Hussain
2022-12-13 12:27     ` Brian Masney
2022-12-13 12:47       ` Mark Brown
2022-12-13 13:02       ` Krzysztof Kozlowski
2022-12-13 13:08         ` Javier Martinez Canillas
2022-12-13 14:36           ` Brian Masney
2022-12-13 14:45             ` Shazad Hussain

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=20221212182314.1902632-2-bmasney@redhat.com \
    --to=bmasney@redhat.com \
    --cc=ahalaney@redhat.com \
    --cc=andersson@kernel.org \
    --cc=devicetree@vger.kernel.org \
    --cc=echanude@redhat.com \
    --cc=johan+linaro@kernel.org \
    --cc=konrad.dybcio@linaro.org \
    --cc=krzysztof.kozlowski+dt@linaro.org \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=quic_shazhuss@quicinc.com \
    --cc=robh+dt@kernel.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).