arm64: dts: qcom: msm8916/39: Cleanup audio pinctrl

The audio pinctrl in MSM8916/MSM8939 is very similar but still has
subtle differences, e.g. &cdc_pdm_lines_act on MSM8916 vs
&cdc_pdm_lines_default on MSM8939.

Make this consistent and use the chance to cleanup all of the audio
pinctrl: Drop unneeded outer nodes and replace the names taken over
from the vendor kernel with more clear ones that are similar to the
actual pinctrl function.

Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230529-msm8916-pinctrl-v1-4-11f540b51c93@gerhold.net

1 files changed, 65 insertions, 70 deletions

diff --git a/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi b/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi
index cbf0f3d311af..2cfaed37cb59 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi
@@ -374,95 +374,89 @@
 		};
 	};
 
-	cdc-pdm-lines-state {
-		cdc_pdm_lines_act: pdm-lines-on-pins {
-			pins = "gpio63", "gpio64", "gpio65", "gpio66",
-			       "gpio67", "gpio68";
-			function = "cdc_pdm0";
+	cdc_pdm_default: cdc-pdm-default-state {
+		pins = "gpio63", "gpio64", "gpio65", "gpio66",
+		       "gpio67", "gpio68";
+		function = "cdc_pdm0";
 
-			drive-strength = <8>;
-			bias-disable;
-		};
-		cdc_pdm_lines_sus: pdm-lines-off-pins {
-			pins = "gpio63", "gpio64", "gpio65", "gpio66",
-			       "gpio67", "gpio68";
-			function = "cdc_pdm0";
+		drive-strength = <8>;
+		bias-disable;
+	};
 
-			drive-strength = <2>;
-			bias-pull-down;
-		};
+	cdc_pdm_sleep: cdc-pdm-sleep-state {
+		pins = "gpio63", "gpio64", "gpio65", "gpio66",
+		       "gpio67", "gpio68";
+		function = "cdc_pdm0";
+
+		drive-strength = <2>;
+		bias-pull-down;
 	};
 
-	ext-pri-tlmm-lines-state {
-		ext_pri_tlmm_lines_act: ext-pa-on-pins {
-			pins = "gpio113", "gpio114", "gpio115", "gpio116";
-			function = "pri_mi2s";
+	pri_mi2s_default: mi2s-pri-default-state {
+		pins = "gpio113", "gpio114", "gpio115", "gpio116";
+		function = "pri_mi2s";
 
-			drive-strength = <8>;
-			bias-disable;
-		};
-		ext_pri_tlmm_lines_sus: ext-pa-off-pins {
-			pins = "gpio113", "gpio114", "gpio115", "gpio116";
-			function = "pri_mi2s";
+		drive-strength = <8>;
+		bias-disable;
+	};
 
-			drive-strength = <2>;
-			bias-disable;
-		};
+	pri_mi2s_sleep: mi2s-pri-sleep-state {
+		pins = "gpio113", "gpio114", "gpio115", "gpio116";
+		function = "pri_mi2s";
+
+		drive-strength = <2>;
+		bias-disable;
 	};
 
-	ext-pri-ws-line-state {
-		ext_pri_ws_act: ext-pa-on-pins {
-			pins = "gpio110";
-			function = "pri_mi2s_ws";
+	pri_mi2s_ws_default: mi2s-pri-ws-default-state {
+		pins = "gpio110";
+		function = "pri_mi2s_ws";
 
-			drive-strength = <8>;
-			bias-disable;
-		};
-		ext_pri_ws_sus: ext-pa-off-pins {
-			pins = "gpio110";
-			function = "pri_mi2s_ws";
+		drive-strength = <8>;
+		bias-disable;
+	};
 
-			drive-strength = <2>;
-			bias-disable;
-		};
+	pri_mi2s_ws_sleep: mi2s-pri-ws-sleep-state {
+		pins = "gpio110";
+		function = "pri_mi2s_ws";
+
+		drive-strength = <2>;
+		bias-disable;
 	};
 
-	ext-mclk-tlmm-lines-state {
-		ext_mclk_tlmm_lines_act: mclk-lines-on-pins {
-			pins = "gpio116";
-			function = "pri_mi2s";
+	pri_mi2s_mclk_default: mi2s-pri-mclk-default-state {
+		pins = "gpio116";
+		function = "pri_mi2s";
 
-			drive-strength = <8>;
-			bias-disable;
-		};
-		ext_mclk_tlmm_lines_sus: mclk-lines-off-pins {
-			pins = "gpio116";
-			function = "pri_mi2s";
+		drive-strength = <8>;
+		bias-disable;
+	};
 
-			drive-strength = <2>;
-			bias-disable;
-		};
+	pri_mi2s_mclk_sleep: mi2s-pri-mclk-sleep-state {
+		pins = "gpio116";
+		function = "pri_mi2s";
+
+		drive-strength = <2>;
+		bias-disable;
 	};
 
-	/* secondary Mi2S */
-	ext-sec-tlmm-lines-state {
-		ext_sec_tlmm_lines_act: tlmm-lines-on-pins {
-			pins = "gpio112", "gpio117", "gpio118", "gpio119";
-			function = "sec_mi2s";
+	sec_mi2s_default: mi2s-sec-default-state {
+		pins = "gpio112", "gpio117", "gpio118", "gpio119";
+		function = "sec_mi2s";
 
-			drive-strength = <8>;
-			bias-disable;
-		};
-		ext_sec_tlmm_lines_sus: tlmm-lines-off-pins {
-			pins = "gpio112", "gpio117", "gpio118", "gpio119";
-			function = "sec_mi2s";
+		drive-strength = <8>;
+		bias-disable;
+	};
 
-			drive-strength = <2>;
-			bias-disable;
-		};
+	sec_mi2s_sleep: mi2s-sec-sleep-state {
+		pins = "gpio112", "gpio117", "gpio118", "gpio119";
+		function = "sec_mi2s";
+
+		drive-strength = <2>;
+		bias-disable;
 	};
 
-	cdc_dmic_lines_act: cdc-dmic-lines-on-state {
+	cdc_dmic_default: cdc-dmic-default-state {
 		clk-pins {
 			pins = "gpio0";
 			function = "dmic0_clk";
@@ -476,7 +470,8 @@
 			drive-strength = <8>;
 		};
 	};
-	cdc_dmic_lines_sus: cdc-dmic-lines-off-state {
+
+	cdc_dmic_sleep: cdc-dmic-sleep-state {
 		clk-pins {
 			pins = "gpio0";
 			function = "dmic0_clk";