diff mbox series

[01/14] arm64: dts: qcom: msm8998*: Fix TLMM and pin nodes

Message ID 20220430162353.607709-1-konrad.dybcio@somainline.org (mailing list archive)
State Queued
Headers show
Series [01/14] arm64: dts: qcom: msm8998*: Fix TLMM and pin nodes | expand

Commit Message

Konrad Dybcio April 30, 2022, 4:23 p.m. UTC
Remove the unnecessary level of indentation, commonize SDC2 pins and notice
that SDCC2_CD_ON and _OFF is identical, deduplicate it!

Also, remove some unnecessary overrides and use decimal values in #-cells

Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
---
 .../dts/qcom/msm8998-asus-novago-tp370ql.dts  |  9 ---
 .../boot/dts/qcom/msm8998-clamshell.dtsi      | 12 ++-
 arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi     |  4 +-
 .../dts/qcom/msm8998-sony-xperia-yoshino.dtsi |  4 +-
 arch/arm64/boot/dts/qcom/msm8998.dtsi         | 75 ++++++-------------
 5 files changed, 33 insertions(+), 71 deletions(-)

Comments

Bjorn Andersson June 28, 2022, 8:18 p.m. UTC | #1
On Sat, 30 Apr 2022 18:23:39 +0200, Konrad Dybcio wrote:
> Remove the unnecessary level of indentation, commonize SDC2 pins and notice
> that SDCC2_CD_ON and _OFF is identical, deduplicate it!
> 
> Also, remove some unnecessary overrides and use decimal values in #-cells
> 
> 

Applied, thanks!

[01/14] arm64: dts: qcom: msm8998*: Fix TLMM and pin nodes
        commit: 12541f687e4994774cbb4158e5fe3ecd6c639bdf
[02/14] arm64: dts: qcom: msm8998-clamshell: Clean up the DT
        commit: ce383e80782e9b416d5022dc692fc80306358372
[03/14] arm64: dts: qcom: msm8998-laptops: Clean up DTs
        commit: 16901ba567d789557b90871e23504a2118c35216
[04/14] arm64: dts: qcom: msm8998-yoshino-lilac: Disable LVS1
        commit: 4efbec42c050e9e59171822a3829c9a364e88611
[05/14] arm64: dts: qcom: msm8998-yoshino: Add USB extcon
        commit: 6dad36ebe1cb219615ead56692cea816d144c645
[06/14] arm64: dts: qcom: msm8998-yoshino: Remove simple-bus compatible from clocks{}
        commit: 016928c052a75bef4ef66d844f0000058429e18c
[07/14] arm64: dts: qcom: msm8998-yoshino/oneplus: Use pm8005_regulators label
        commit: b448501c2e770aad1c09abadec2045c35eb08f36
[08/14] arm64: dts: qcom: msm8998-oneplus: Apply style fixes
        commit: bc0e82fbb25b32b5c69bef017ebd3e79b85883d4
[09/14] arm64: dts: qcom: msm8998-fxtec: Use "okay" instead of "ok"
        commit: 20bba6b73264e7a7f1743676d7942e25d3a2131d
[10/14] arm64: dts: qcom: msm8998*: Keep MMCC & MMSS_SMMU enabled by default
        commit: 392b73cb816094348abb7e3ff1288b5786b4ee16
[11/14] arm64: dts: qcom: msm8998-oneplus: Add clocks & GDSC to simplefb
        commit: d582c02012d2a07251339bf0762223dbc6bb2955
[12/14] arm64: dts: qcom: msm8998*: Clean up #includes
        commit: 5d393f14d4de41ff30ccad78129d96606eca827c
[13/14] arm64: dts: qcom: msm8998-fxtec: Decouple from 8998 MTP
        commit: d0eaf4122c9eb6a7536bf1a607c0570ca82daa99
[14/14] arm64: dts: qcom: msm8998-mtp: Merge and fix up the DT
        commit: 3ae6156e2f414f0ba2bf860e4173bbd366d5e101

Best regards,
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/qcom/msm8998-asus-novago-tp370ql.dts b/arch/arm64/boot/dts/qcom/msm8998-asus-novago-tp370ql.dts
index e204b7050441..37f994351565 100644
--- a/arch/arm64/boot/dts/qcom/msm8998-asus-novago-tp370ql.dts
+++ b/arch/arm64/boot/dts/qcom/msm8998-asus-novago-tp370ql.dts
@@ -37,12 +37,3 @@  keyboard@3a {
 &sdhc2 {
 	cd-gpios = <&tlmm 95 GPIO_ACTIVE_HIGH>;
 };
-
-&tlmm {
-	touchpad: touchpad {
-		config {
-			pins = "gpio123";
-			bias-pull-up;
-		};
-	};
-};
diff --git a/arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi b/arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi
index b3b352530d76..6e70c1ead5e1 100644
--- a/arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi
@@ -289,11 +289,9 @@  &remoteproc_mss {
 &tlmm {
 	gpio-reserved-ranges = <0 4>, <81 4>;
 
-	touchpad: touchpad {
-		config {
-			pins = "gpio123";
-			bias-pull-up;           /* pull up */
-		};
+	touchpad: touchpad-pin {
+		pins = "gpio123";
+		bias-pull-up;
 	};
 };
 
@@ -304,8 +302,8 @@  &sdhc2 {
 	vqmmc-supply = <&vreg_l13a_2p95>;
 
 	pinctrl-names = "default", "sleep";
-	pinctrl-0 = <&sdc2_clk_on  &sdc2_cmd_on  &sdc2_data_on  &sdc2_cd_on>;
-	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>;
+	pinctrl-0 = <&sdc2_on &sdc2_cd>;
+	pinctrl-1 = <&sdc2_off &sdc2_cd>;
 };
 
 &ufshc {
diff --git a/arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi b/arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi
index af67c641df4e..8368af2d78e1 100644
--- a/arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi
@@ -348,8 +348,8 @@  &sdhc2 {
 	vqmmc-supply = <&vreg_l13a_2p95>;
 
 	pinctrl-names = "default", "sleep";
-	pinctrl-0 = <&sdc2_clk_on  &sdc2_cmd_on  &sdc2_data_on  &sdc2_cd_on>;
-	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>;
+	pinctrl-0 = <&sdc2_on &sdc2_cd>;
+	pinctrl-1 = <&sdc2_off &sdc2_cd>;
 };
 
 &stm {
diff --git a/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi b/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi
index 03fa66646d47..fd65dee55626 100644
--- a/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi
@@ -580,8 +580,8 @@  &sdhc2 {
 	vqmmc-supply = <&vreg_l13a_2p95>;
 
 	pinctrl-names = "default", "sleep";
-	pinctrl-0 = <&sdc2_clk_on  &sdc2_cmd_on  &sdc2_data_on  &sdc2_cd_on>;
-	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>;
+	pinctrl-0 = <&sdc2_on &sdc2_cd>;
+	pinctrl-1 = <&sdc2_off &sdc2_cd>;
 };
 
 &tlmm {
diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi
index 2fda21e810c9..69cdbb104e4c 100644
--- a/arch/arm64/boot/dts/qcom/msm8998.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi
@@ -1042,85 +1042,58 @@  tlmm: pinctrl@3400000 {
 			reg = <0x03400000 0xc00000>;
 			interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>;
 			gpio-controller;
-			#gpio-cells = <0x2>;
+			#gpio-cells = <2>;
 			interrupt-controller;
-			#interrupt-cells = <0x2>;
+			#interrupt-cells = <2>;
 
-			sdc2_clk_on: sdc2_clk_on {
-				config {
+			sdc2_on: sdc2-on {
+				clk {
 					pins = "sdc2_clk";
-					bias-disable;
 					drive-strength = <16>;
-				};
-			};
-
-			sdc2_clk_off: sdc2_clk_off {
-				config {
-					pins = "sdc2_clk";
 					bias-disable;
-					drive-strength = <2>;
 				};
-			};
 
-			sdc2_cmd_on: sdc2_cmd_on {
-				config {
+				cmd {
 					pins = "sdc2_cmd";
-					bias-pull-up;
 					drive-strength = <10>;
-				};
-			};
-
-			sdc2_cmd_off: sdc2_cmd_off {
-				config {
-					pins = "sdc2_cmd";
 					bias-pull-up;
-					drive-strength = <2>;
 				};
-			};
 
-			sdc2_data_on: sdc2_data_on {
-				config {
+				data {
 					pins = "sdc2_data";
-					bias-pull-up;
 					drive-strength = <10>;
+					bias-pull-up;
 				};
 			};
 
-			sdc2_data_off: sdc2_data_off {
-				config {
-					pins = "sdc2_data";
-					bias-pull-up;
+			sdc2_off: sdc2-off {
+				clk {
+					pins = "sdc2_clk";
 					drive-strength = <2>;
+					bias-disable;
 				};
-			};
 
-			sdc2_cd_on: sdc2_cd_on {
-				mux {
-					pins = "gpio95";
-					function = "gpio";
+				cmd {
+					pins = "sdc2_cmd";
+					drive-strength = <2>;
+					bias-pull-up;
 				};
 
-				config {
-					pins = "gpio95";
-					bias-pull-up;
+				data {
+					pins = "sdc2_data";
 					drive-strength = <2>;
+					bias-pull-up;
 				};
 			};
 
-			sdc2_cd_off: sdc2_cd_off {
-				mux {
-					pins = "gpio95";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio95";
-					bias-pull-up;
-					drive-strength = <2>;
-				};
+			sdc2_cd: sdc2-cd {
+				pins = "gpio95";
+				function = "gpio";
+				bias-pull-up;
+				drive-strength = <2>;
 			};
 
-			blsp1_uart3_on: blsp1_uart3_on {
+			blsp1_uart3_on: blsp1-uart3-on {
 				tx {
 					pins = "gpio45";
 					function = "blsp_uart3_a";