Skip to contentSkip to conversation

arm64: dts: qcom: sc7x80: A smattering of misc dts cleanups

PATCH Superseded Douglas Anderson 4 participants 15 messages Feb 1, 2022 – Feb 4, 2022

Subsystems (4)

v1 of 3 Superseded 4 of 5 applied Latest is v3 →

lore
Share & tools
lore
#0 lore raw

cover arm64: dts: qcom: sc7x80: A smattering of misc dts cleanups

There's nothing really holding this series together except that it fixes a smattering of random dts stuff that I noticed recently. There are no real dependencies other than the second "sdc" change depends on the first.

Hopefully these look OK and can be applied quickly to avoid conflicts with other work going on.

NOTE: if these changes land then my "herobrine-rev1" change definitely needs to be re-posted. I've got that ready to go once we resolve the cpufreq stuff.

Douglas Anderson (5):
arm64: dts: qcom: sc7180-trogdor: Add "-regulator" suffix to

    pp3300_hub

arm64: dts: qcom: sc7280-herobrine: Consistently add "-regulator"
suffix
arm64: dts: qcom: sc7280: Properly sort sdc pinctrl lines
arm64: dts: qcom: sc7280: Clean up sdc1 / sdc2 pinctrl
arm64: dts: qcom: sc7280-idp: No need for "input-enable" on sw_ctrl

 arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi  |   2 +-
 .../qcom/sc7280-herobrine-herobrine-r0.dts    |  85 +++++-----
 arch/arm64/boot/dts/qcom/sc7280-idp.dtsi      |  90 +++++-----
 arch/arm64/boot/dts/qcom/sc7280.dtsi          | 155 +++++++++---------
 4 files changed, 159 insertions(+), 173 deletions(-)
Signature · 1 line
2.35.0.rc2.247.g8bbb082509-goog
#1 lore raw

PATCH 1/5 arm64: dts: qcom: sc7180-trogdor: Add "-regulator" suffix to pp3300_hub

All of the other fixed regulators have the "-regulator" suffix. Add it to pp3300_hub to match.

---

 arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +1 -1
index 7d8bf66e8ffe..78296ed6fd29 100644
@@ -284,7 +284,7 @@ pp3300_fp_tp: pp3300-fp-tp-regulator {
 		vin-supply = <&pp3300_a>;
 	};
 
-	pp3300_hub: pp3300-hub {
+	pp3300_hub: pp3300-hub-regulator {
 		compatible = "regulator-fixed";
 		regulator-name = "pp3300_hub";
 
Signature · 1 line
2.35.0.rc2.247.g8bbb082509-goog
#3 lore raw

PATCH 2/5 arm64: dts: qcom: sc7280-herobrine: Consistently add "-regulator" suffix

In reply to Douglas Anderson

Some of the fixed regulators were missing the "-regulator" suffix. Add it to be consistent within the file and consistent with the fixed regulators in sc7180-trogdor.

---

 .../boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts +6 -6
index ad4fe288b53c..f159b5a6d7ef 100644
@@ -177,7 +177,7 @@ pp3300_tp: pp3300-tp-regulator {
 		vin-supply = <&pp3300_z1>;
 	};
 
-	pp2850_uf_cam: pp2850-uf-cam {
+	pp2850_uf_cam: pp2850-uf-cam-regulator {
 		compatible = "regulator-fixed";
 		regulator-name = "pp2850_uf_cam";
 
@@ -192,7 +192,7 @@ pp2850_uf_cam: pp2850-uf-cam {
 		vin-supply = <&pp3300_cam>;
 	};
 
-	pp2850_vcm_wf_cam: pp2850-vcm-wf-cam {
+	pp2850_vcm_wf_cam: pp2850-vcm-wf-cam-regulator {
 		compatible = "regulator-fixed";
 		regulator-name = "pp2850_vcm_wf_cam";
 
@@ -207,7 +207,7 @@ pp2850_vcm_wf_cam: pp2850-vcm-wf-cam {
 		vin-supply = <&pp3300_cam>;
 	};
 
-	pp2850_wf_cam: pp2850-wf-cam {
+	pp2850_wf_cam: pp2850-wf-cam-regulator {
 		compatible = "regulator-fixed";
 		regulator-name = "pp2850_wf_cam";
 
@@ -251,7 +251,7 @@ pp1800_fp: pp1800-fp-regulator {
 		status = "disabled";
 	};
 
-	pp1800_uf_cam: pp1800-uf-cam {
+	pp1800_uf_cam: pp1800-uf-cam-regulator {
 		compatible = "regulator-fixed";
 		regulator-name = "pp1800_uf_cam";
 
@@ -271,7 +271,7 @@ pp1800_uf_cam: pp1800-uf-cam {
 		vin-supply = <&pp1800_l19b>;
 	};
 
-	pp1800_wf_cam: pp1800-wf-cam {
+	pp1800_wf_cam: pp1800-wf-cam-regulator {
 		compatible = "regulator-fixed";
 		regulator-name = "pp1800_wf_cam";
 
@@ -291,7 +291,7 @@ pp1800_wf_cam: pp1800-wf-cam {
 		vin-supply = <&pp1800_l19b>;
 	};
 
-	pp1200_wf_cam: pp1200-wf-cam {
+	pp1200_wf_cam: pp1200-wf-cam-regulator {
 		compatible = "regulator-fixed";
 		regulator-name = "pp1200_wf_cam";
 
Signature · 1 line
2.35.0.rc2.247.g8bbb082509-goog
#5 lore raw

PATCH 3/5 arm64: dts: qcom: sc7280: Properly sort sdc pinctrl lines

In reply to Douglas Anderson

The sdc1 / sdc2 pinctrl lines were randomly stuffed in the middle of the qup pinctrl lines. Sort them properly. This is a no-op change. Just code movement.

---

 arch/arm64/boot/dts/qcom/sc7280.dtsi | 154 +++++++++++++--------------
 1 file changed, 77 insertions(+), 77 deletions(-)
arch/arm64/boot/dts/qcom/sc7280.dtsi +77 -77
index d4009cc0bb78..40cb414bc377 100644
@@ -3783,83 +3783,6 @@ qup_uart7_rx: qup-uart7-rx {
 				function = "qup07";
 			};
 
-			sdc1_on: sdc1-on {
-				clk {
-					pins = "sdc1_clk";
-				};
-
-				cmd {
-					pins = "sdc1_cmd";
-				};
-
-				data {
-					pins = "sdc1_data";
-				};
-
-				rclk {
-					pins = "sdc1_rclk";
-				};
-			};
-
-			sdc1_off: sdc1-off {
-				clk {
-					pins = "sdc1_clk";
-					drive-strength = <2>;
-					bias-bus-hold;
-				};
-
-				cmd {
-					pins = "sdc1_cmd";
-					drive-strength = <2>;
-					bias-bus-hold;
-				};
-
-				data {
-					pins = "sdc1_data";
-					drive-strength = <2>;
-					bias-bus-hold;
-				};
-
-				rclk {
-					pins = "sdc1_rclk";
-					bias-bus-hold;
-				};
-			};
-
-			sdc2_on: sdc2-on {
-				clk {
-					pins = "sdc2_clk";
-				};
-
-				cmd {
-					pins = "sdc2_cmd";
-				};
-
-				data {
-					pins = "sdc2_data";
-				};
-			};
-
-			sdc2_off: sdc2-off {
-				clk {
-					pins = "sdc2_clk";
-					drive-strength = <2>;
-					bias-bus-hold;
-				};
-
-				cmd {
-					pins ="sdc2_cmd";
-					drive-strength = <2>;
-					bias-bus-hold;
-				};
-
-				data {
-					pins ="sdc2_data";
-					drive-strength = <2>;
-					bias-bus-hold;
-				};
-			};
-
 			qup_uart8_cts: qup-uart8-cts {
 				pins = "gpio32";
 				function = "qup10";
@@ -4019,6 +3942,83 @@ qup_uart15_rx: qup-uart15-rx {
 				pins = "gpio63";
 				function = "qup17";
 			};
+
+			sdc1_on: sdc1-on {
+				clk {
+					pins = "sdc1_clk";
+				};
+
+				cmd {
+					pins = "sdc1_cmd";
+				};
+
+				data {
+					pins = "sdc1_data";
+				};
+
+				rclk {
+					pins = "sdc1_rclk";
+				};
+			};
+
+			sdc1_off: sdc1-off {
+				clk {
+					pins = "sdc1_clk";
+					drive-strength = <2>;
+					bias-bus-hold;
+				};
+
+				cmd {
+					pins = "sdc1_cmd";
+					drive-strength = <2>;
+					bias-bus-hold;
+				};
+
+				data {
+					pins = "sdc1_data";
+					drive-strength = <2>;
+					bias-bus-hold;
+				};
+
+				rclk {
+					pins = "sdc1_rclk";
+					bias-bus-hold;
+				};
+			};
+
+			sdc2_on: sdc2-on {
+				clk {
+					pins = "sdc2_clk";
+				};
+
+				cmd {
+					pins = "sdc2_cmd";
+				};
+
+				data {
+					pins = "sdc2_data";
+				};
+			};
+
+			sdc2_off: sdc2-off {
+				clk {
+					pins = "sdc2_clk";
+					drive-strength = <2>;
+					bias-bus-hold;
+				};
+
+				cmd {
+					pins ="sdc2_cmd";
+					drive-strength = <2>;
+					bias-bus-hold;
+				};
+
+				data {
+					pins ="sdc2_data";
+					drive-strength = <2>;
+					bias-bus-hold;
+				};
+			};
 		};
 
 		imem@146a5000 {
Signature · 1 line
2.35.0.rc2.247.g8bbb082509-goog
#7 lore raw

PATCH 4/5 arm64: dts: qcom: sc7280: Clean up sdc1 / sdc2 pinctrl

In reply to Douglas Anderson

This patch makes a few improvements to the way that sdc1 / sdc2 pinctrl is specified on sc7280:

1. There's no reason to "group" the sdc pins into one overarching node and there's a downside: we have to replicate the hierarchy in the board device tree files. Let's clean this up.

2. There's really not a lot of reason not to list the "pinctrl" for sdc1 (eMMC) in the SoC dtsi file. These aren't GPIO pins and everyone's going to specify the same pins.

3. Even though it's likely that boards will need to override pinctrl for sdc2 (SD card) to add the card detect GPIO, we can be symmetric and add it to the SoC dsti file.

4. Let's get rid of the word "on" from the normal config and add a "sleep" suffix to the sleep config. This looks cleaner to me.

This is intended to be a no-op change but it could plausibly change behavior depending on how the pinctrl code parses things. One thing to note is that "SD card detect" is explicitly listed now as keeping its pull enabled in sleep since we still want to detect card insertions even if the controller is suspended (because no card is inserted). The pinctrl framework likely did this anyway, but it's nice to see it explicit.

---

 .../qcom/sc7280-herobrine-herobrine-r0.dts    |  73 +++++------
 arch/arm64/boot/dts/qcom/sc7280-idp.dtsi      |  91 +++++++-------
 arch/arm64/boot/dts/qcom/sc7280.dtsi          | 119 +++++++++---------
 3 files changed, 135 insertions(+), 148 deletions(-)
arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts +33 -40
index f159b5a6d7ef..918352c097bc 100644
@@ -676,9 +676,6 @@ &qupv3_id_1 {
 &sdhc_1 {
 	status = "okay";
 
-	pinctrl-names = "default", "sleep";
-	pinctrl-0 = <&sdc1_on>;
-	pinctrl-1 = <&sdc1_off>;
 	vmmc-supply = <&pp2950_l7b>;
 	vqmmc-supply = <&pp1800_l19b>;
 };
@@ -686,9 +683,8 @@ &sdhc_1 {
 &sdhc_2 {
 	status = "okay";
 
-	pinctrl-names = "default", "sleep";
-	pinctrl-0 = <&sdc2_on>;
-	pinctrl-1 = <&sdc2_off>;
+	pinctrl-0 = <&sdc2_clk>, <&sdc2_cmd>, <&sdc2_data>, <&sd_cd>;
+	pinctrl-1 = <&sdc2_clk_sleep>, <&sdc2_cmd_sleep>, <&sdc2_data_sleep>, <&sd_cd>;
 	vmmc-supply = <&pp2950_l9c>;
 	vqmmc-supply = <&ppvar_l6c>;
 
@@ -883,47 +879,38 @@ &qup_uart7_rx {
 	bias-pull-up;
 };
 
-&sdc1_on {
-	clk {
-		bias-disable;
-		drive-strength = <16>;
-	};
-
-	cmd {
-		bias-pull-up;
-		drive-strength = <10>;
-	};
+&sdc1_clk {
+	bias-disable;
+	drive-strength = <16>;
+};
 
-	data {
-		bias-pull-up;
-		drive-strength = <10>;
-	};
+&sdc1_cmd {
+	bias-pull-up;
+	drive-strength = <10>;
+};
 
-	rclk {
-		bias-pull-down;
-	};
+&sdc1_data {
+	bias-pull-up;
+	drive-strength = <10>;
 };
 
-&sdc2_on {
-	clk {
-		bias-disable;
-		drive-strength = <16>;
-	};
+&sdc1_rclk {
+	bias-pull-down;
+};
 
-	cmd {
-		bias-pull-up;
-		drive-strength = <10>;
-	};
+&sdc2_clk {
+	bias-disable;
+	drive-strength = <16>;
+};
 
-	data {
-		bias-pull-up;
-		drive-strength = <10>;
-	};
+&sdc2_cmd {
+	bias-pull-up;
+	drive-strength = <10>;
+};
 
-	sd-cd {
-		pins = "gpio91";
-		bias-pull-up;
-	};
+&sdc2_data {
+	bias-pull-up;
+	drive-strength = <10>;
 };
 
 /* PINCTRL - board-specific pinctrl */
@@ -1311,6 +1298,12 @@ qup_uart7_sleep_tx: qup-uart7-sleep-tx {
 		bias-pull-up;
 	};
 
+	sd_cd: sd-cd {
+		pins = "gpio91";
+		function = "gpio";
+		bias-pull-up;
+	};
+
 	tp_int_odl: tp-int-odl {
 		pins = "gpio102";
 		function = "gpio";
arch/arm64/boot/dts/qcom/sc7280-idp.dtsi +42 -49

120 lines not on this page · raw message

arch/arm64/boot/dts/qcom/sc7280.dtsi +60 -59

153 lines not on this page · raw message

Signature · 1 line
2.35.0.rc2.247.g8bbb082509-goog
#8 lore raw

Re: [PATCH 4/5] arm64: dts: qcom: sc7280: Clean up sdc1 / sdc2 pinctrl

Hi,

Quoted 32 lines · Douglas Anderson
arch/arm64/boot/dts/qcom/sc7280.dtsi +6 -3
index 40cb414bc377..dc98a87e2871 100644
@@ -616,6 +616,9 @@ qfprom: efuse@784000 {
 
                sdhc_1: sdhci@7c4000 {
                        compatible = "qcom,sc7280-sdhci", "qcom,sdhci-msm-v5";
+                       pinctrl-names = "default", "sleep";
+                       pinctrl-0 = <&sdc1_clk>, <&sdc1_cmd>, <&sdc1_data>, <&sdc1_rclk>;
+                       pinctrl-1 = <&sdc1_clk_sleep>, <&sdc1_cmd_sleep>, <&sdc1_data_sleep>, <&sdc1_rclk_sleep>;
                        status = "disabled";
 
                        reg = <0 0x007c4000 0 0x1000>,
@@ -2425,6 +2428,9 @@ apss_merge_funnel_in: endpoint {
 
                sdhc_2: sdhci@8804000 {
                        compatible = "qcom,sc7280-sdhci", "qcom,sdhci-msm-v5";
+                       pinctrl-names = "default", "sleep";
+                       pinctrl-0 = <&sdc2_clk>, <&sdc2_cmd>, <&sdc2_data>;
+                       pinctrl-1 = <&sdc2_clk_sleep>, <&sdc2_cmd_sleep>, <&sdc2_data_sleep>;
                        status = "disabled";
 
                        reg = <0 0x08804000 0 0x1000>;
@@ -3943,81 +3949,76 @@ qup_uart15_rx: qup-uart15-rx {
                                function = "qup17";
                        };
 
-                       sdc1_on: sdc1-on {
-                               clk {
-                                       pins = "sdc1_clk";

arch/arm64/boot/dts/qcom/sc7280.dtsi qup_uart15_rx: qup-uart15-rx { · line 3954

Quoted 10 lines
arch/arm64/boot/dts/qcom/sc7280.dtsi +1 -7
-                               };
 
-                               cmd {
-                                       pins = "sdc1_cmd";
-                               };
 
-                               data {
-                                       pins = "sdc1_data";
-                               };
+                       sdc1_clk: sdc1-clk {

Ugh. I just noticed that there are way too many blank lines here in the output. Happy to have this fixed when applying or I can post a v2.

-Doug

#9 lore raw

Re: [PATCH 4/5] arm64: dts: qcom: sc7280: Clean up sdc1 / sdc2 pinctrl

Quoted 41 lines · Doug Anderson

Hi,

Quoted 38 lines · Douglas Anderson
arch/arm64/boot/dts/qcom/sc7280.dtsi +6 -7
index 40cb414bc377..dc98a87e2871 100644
@@ -616,6 +616,9 @@ qfprom: efuse@784000 {
 
                sdhc_1: sdhci@7c4000 {
                        compatible = "qcom,sc7280-sdhci", "qcom,sdhci-msm-v5";
+                       pinctrl-names = "default", "sleep";
+                       pinctrl-0 = <&sdc1_clk>, <&sdc1_cmd>, <&sdc1_data>, <&sdc1_rclk>;
+                       pinctrl-1 = <&sdc1_clk_sleep>, <&sdc1_cmd_sleep>, <&sdc1_data_sleep>, <&sdc1_rclk_sleep>;
                        status = "disabled";
 
                        reg = <0 0x007c4000 0 0x1000>,
@@ -2425,6 +2428,9 @@ apss_merge_funnel_in: endpoint {
 
                sdhc_2: sdhci@8804000 {
                        compatible = "qcom,sc7280-sdhci", "qcom,sdhci-msm-v5";
+                       pinctrl-names = "default", "sleep";
+                       pinctrl-0 = <&sdc2_clk>, <&sdc2_cmd>, <&sdc2_data>;
+                       pinctrl-1 = <&sdc2_clk_sleep>, <&sdc2_cmd_sleep>, <&sdc2_data_sleep>;
                        status = "disabled";
 
                        reg = <0 0x08804000 0 0x1000>;
@@ -3943,81 +3949,76 @@ qup_uart15_rx: qup-uart15-rx {
                                function = "qup17";
                        };
 
-                       sdc1_on: sdc1-on {
-                               clk {
-                                       pins = "sdc1_clk";
-                               };
 
-                               cmd {
-                                       pins = "sdc1_cmd";
-                               };
 
Quoted 8 lines

arch/arm64/boot/dts/qcom/sc7280.dtsi qup_uart15_rx: qup-uart15-rx { · line 3954

Quoted 4 lines
arch/arm64/boot/dts/qcom/sc7280.dtsi +1 -3
-                               data {
-                                       pins = "sdc1_data";
-                               };
+                       sdc1_clk: sdc1-clk {

Ugh. I just noticed that there are way too many blank lines here in the output. Happy to have this fixed when applying or I can post a v2.

I can fix that up as I apply it. Will let it sit for a few days to attract reviews first though.

Regards,
Bjorn

#10 lore raw

Re: [PATCH 4/5] arm64: dts: qcom: sc7280: Clean up sdc1 / sdc2 pinctrl

Hi,

Quoted 53 lines · Bjorn Andersson
Quoted 41 lines · Doug Anderson

Hi,

Quoted 38 lines · Douglas Anderson
arch/arm64/boot/dts/qcom/sc7280.dtsi +6 -7
index 40cb414bc377..dc98a87e2871 100644
@@ -616,6 +616,9 @@ qfprom: efuse@784000 {
 
                sdhc_1: sdhci@7c4000 {
                        compatible = "qcom,sc7280-sdhci", "qcom,sdhci-msm-v5";
+                       pinctrl-names = "default", "sleep";
+                       pinctrl-0 = <&sdc1_clk>, <&sdc1_cmd>, <&sdc1_data>, <&sdc1_rclk>;
+                       pinctrl-1 = <&sdc1_clk_sleep>, <&sdc1_cmd_sleep>, <&sdc1_data_sleep>, <&sdc1_rclk_sleep>;
                        status = "disabled";
 
                        reg = <0 0x007c4000 0 0x1000>,
@@ -2425,6 +2428,9 @@ apss_merge_funnel_in: endpoint {
 
                sdhc_2: sdhci@8804000 {
                        compatible = "qcom,sc7280-sdhci", "qcom,sdhci-msm-v5";
+                       pinctrl-names = "default", "sleep";
+                       pinctrl-0 = <&sdc2_clk>, <&sdc2_cmd>, <&sdc2_data>;
+                       pinctrl-1 = <&sdc2_clk_sleep>, <&sdc2_cmd_sleep>, <&sdc2_data_sleep>;
                        status = "disabled";
 
                        reg = <0 0x08804000 0 0x1000>;
@@ -3943,81 +3949,76 @@ qup_uart15_rx: qup-uart15-rx {
                                function = "qup17";
                        };
 
-                       sdc1_on: sdc1-on {
-                               clk {
-                                       pins = "sdc1_clk";
-                               };
 
-                               cmd {
-                                       pins = "sdc1_cmd";
-                               };
 
Quoted 8 lines

arch/arm64/boot/dts/qcom/sc7280.dtsi qup_uart15_rx: qup-uart15-rx { · line 3954

Quoted 4 lines
arch/arm64/boot/dts/qcom/sc7280.dtsi +1 -3
-                               data {
-                                       pins = "sdc1_data";
-                               };
+                       sdc1_clk: sdc1-clk {

Ugh. I just noticed that there are way too many blank lines here in the output. Happy to have this fixed when applying or I can post a v2.

Quoted 2 lines

I can fix that up as I apply it. Will let it sit for a few days to attract reviews first though.

Sounds good. Thanks! I might end up sending a v2 anyway since I found a few more fixups, but I'll at least wait a day or two so I don't spam people too hard.

-Doug

#11 lore raw

Re: [PATCH 4/5] arm64: dts: qcom: sc7280: Clean up sdc1 / sdc2 pinctrl

Hi,

Quoted 58 lines · Doug Anderson

Hi,

Quoted 53 lines · Bjorn Andersson
Quoted 49 lines · Doug Anderson

Hi,

Quoted 32 lines · Douglas Anderson
arch/arm64/boot/dts/qcom/sc7280.dtsi +6 -3
index 40cb414bc377..dc98a87e2871 100644
@@ -616,6 +616,9 @@ qfprom: efuse@784000 {
 
                sdhc_1: sdhci@7c4000 {
                        compatible = "qcom,sc7280-sdhci", "qcom,sdhci-msm-v5";
+                       pinctrl-names = "default", "sleep";
+                       pinctrl-0 = <&sdc1_clk>, <&sdc1_cmd>, <&sdc1_data>, <&sdc1_rclk>;
+                       pinctrl-1 = <&sdc1_clk_sleep>, <&sdc1_cmd_sleep>, <&sdc1_data_sleep>, <&sdc1_rclk_sleep>;
                        status = "disabled";
 
                        reg = <0 0x007c4000 0 0x1000>,
@@ -2425,6 +2428,9 @@ apss_merge_funnel_in: endpoint {
 
                sdhc_2: sdhci@8804000 {
                        compatible = "qcom,sc7280-sdhci", "qcom,sdhci-msm-v5";
+                       pinctrl-names = "default", "sleep";
+                       pinctrl-0 = <&sdc2_clk>, <&sdc2_cmd>, <&sdc2_data>;
+                       pinctrl-1 = <&sdc2_clk_sleep>, <&sdc2_cmd_sleep>, <&sdc2_data_sleep>;
                        status = "disabled";
 
                        reg = <0 0x08804000 0 0x1000>;
@@ -3943,81 +3949,76 @@ qup_uart15_rx: qup-uart15-rx {
                                function = "qup17";
                        };
 
-                       sdc1_on: sdc1-on {
-                               clk {
-                                       pins = "sdc1_clk";

arch/arm64/boot/dts/qcom/sc7280.dtsi qup_uart15_rx: qup-uart15-rx { · line 3954

Quoted 10 lines
arch/arm64/boot/dts/qcom/sc7280.dtsi +1 -7
-                               };
 
-                               cmd {
-                                       pins = "sdc1_cmd";
-                               };
 
-                               data {
-                                       pins = "sdc1_data";
-                               };
+                       sdc1_clk: sdc1-clk {

Ugh. I just noticed that there are way too many blank lines here in the output. Happy to have this fixed when applying or I can post a v2.

Quoted 6 lines
Quoted 2 lines

I can fix that up as I apply it. Will let it sit for a few days to attract reviews first though.

Sounds good. Thanks! I might end up sending a v2 anyway since I found a few more fixups, but I'll at least wait a day or two so I don't spam people too hard.

Breadcrumbs: I ended up sending out a v2 (tagged as v3 for other reasons) that fixes this.

https://lore.kernel.org/r/20220202132301.v3.4.I79baad7f52351aafb470f8b21a9fa79d7031ad6a@changeid/

-Doug

#12 lore raw

PATCH 5/5 arm64: dts: qcom: sc7280-idp: No need for "input-enable" on sw_ctrl

In reply to Douglas Anderson

Specifying "input-enable" on a MSM GPIO is a no-op for the most part. The only thing it really does is to explicitly force the output of a GPIO to be disabled right at the point of a pinctrl transition. We don't need to do this and we don't typically specify "input-enable" unless there's a good reason to. Remove it.

---

 arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 1 -
 1 file changed, 1 deletion(-)
arch/arm64/boot/dts/qcom/sc7280-idp.dtsi +0 -1
index 7a987bc9b758..23e656e51904 100644
@@ -534,7 +534,6 @@ sd_cd: sd-cd {
 	sw_ctrl: sw-ctrl {
 		pins = "gpio86";
 		function = "gpio";
-		input-enable;
 		bias-pull-down;
 	};
 };
Signature · 1 line
2.35.0.rc2.247.g8bbb082509-goog
Reviewed-by on v1 5/5
#13 lore raw

Re: [PATCH 5/5] arm64: dts: qcom: sc7280-idp: No need for "input-enable" on sw_ctrl

Quoted 7 lines · Douglas Anderson

Specifying "input-enable" on a MSM GPIO is a no-op for the most part. The only thing it really does is to explicitly force the output of a GPIO to be disabled right at the point of a pinctrl transition. We don't need to do this and we don't typically specify "input-enable" unless there's a good reason to. Remove it.

#14 lore raw
In reply to Douglas Anderson
This series was applied to qcom/linux.git (for-next) by Bjorn Andersson <[email protected]>:

Hello:

This series was applied to qcom/linux.git (for-next) by Bjorn Andersson <[email protected]>:

Quoted 9 lines · On Mon, 31 Jan 2022 16:10:37 -0800 you wrote:

There's nothing really holding this series together except that it fixes a smattering of random dts stuff that I noticed recently. There are no real dependencies other than the second "sdc" change depends on the first.

Hopefully these look OK and can be applied quickly to avoid conflicts with other work going on.

[...]

Here is the summary with links:
- [1/5] arm64: dts: qcom: sc7180-trogdor: Add "-regulator" suffix to pp3300_hub

    https://git.kernel.org/qcom/c/171bac46700f
  - [2/5] arm64: dts: qcom: sc7280-herobrine: Consistently add "-regulator" suffix
    https://git.kernel.org/qcom/c/7a86ac040565
  - [3/5] arm64: dts: qcom: sc7280: Properly sort sdc pinctrl lines
    https://git.kernel.org/qcom/c/b1969bc52218
  - [4/5] arm64: dts: qcom: sc7280: Clean up sdc1 / sdc2 pinctrl
    (no matching commit)
  - [5/5] arm64: dts: qcom: sc7280-idp: No need for "input-enable" on sw_ctrl
    https://git.kernel.org/qcom/c/8fdedd6c6464

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html