arm64: dts: qcom: msm8939: Drop generic UART pinctrl templates

Remove the generic UART pinctrl templates from msm8939.dtsi and copy the
definition for the custom UART use cases into the board DT files. This
makes it clear that the set of pins/pull etc are specific to the board and
UART use case.

No functional change.

Signed-off-by: Stephan Gerhold <stephan.gerhold@linaro.org>
Link: https://lore.kernel.org/r/20250422-msm8916-console-pinctrl-v2-6-f345b7a53c91@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/apq8039-t2.dts b/arch/arm64/boot/dts/qcom/apq8039-t2.dts
index 4aa0ad19bc0f7fde6f5f3a93cdb6be19fb4f1f65..38c281f0fe65ccfc49de70eaef2a970323ecebc8 100644 (file)
--- a/arch/arm64/boot/dts/qcom/apq8039-t2.dts
+++ b/arch/arm64/boot/dts/qcom/apq8039-t2.dts
@@ -122,14 +122,6 @@
        status = "okay";
 };
 
-&blsp_uart1_default {
-       pins = "gpio0", "gpio1";
-};
-
-&blsp_uart1_sleep {
-       pins = "gpio0", "gpio1";
-};
-
 &blsp_uart2 {
        pinctrl-0 = <&blsp_uart2_console_default>;
        pinctrl-1 = <&blsp_uart2_console_sleep>;
@@ -329,6 +321,20 @@
                "USBC_GPIO7_1V8",       /* GPIO_120 */
                "NC";
 
+       blsp_uart1_default: blsp-uart1-default-state {
+               pins = "gpio0", "gpio1";
+               function = "blsp_uart1";
+               drive-strength = <16>;
+               bias-disable;
+       };
+
+       blsp_uart1_sleep: blsp-uart1-sleep-state {
+               pins = "gpio0", "gpio1";
+               function = "gpio";
+               drive-strength = <2>;
+               bias-pull-down;
+       };
+
        pinctrl_backlight: backlight-state {
                pins = "gpio98";
                function = "gpio";

diff --git a/arch/arm64/boot/dts/qcom/msm8939.dtsi b/arch/arm64/boot/dts/qcom/msm8939.dtsi
index 52a99aea210e04f04f3d25696ecd6b9c604c743a..68b92fdb996c26e7a1aadedf0f52e1afca85c4ab 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8939.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8939.dtsi
@@ -905,20 +905,6 @@
                                bias-pull-down;
                        };
 
-                       blsp_uart1_default: blsp-uart1-default-state {
-                               pins = "gpio0", "gpio1", "gpio2", "gpio3";
-                               function = "blsp_uart1";
-                               drive-strength = <16>;
-                               bias-disable;
-                       };
-
-                       blsp_uart1_sleep: blsp-uart1-sleep-state {
-                               pins = "gpio0", "gpio1", "gpio2", "gpio3";
-                               function = "gpio";
-                               drive-strength = <2>;
-                               bias-pull-down;
-                       };
-
                        blsp_uart1_console_default: blsp-uart1-console-default-state {
                                tx-pins {
                                        pins = "gpio0";
@@ -944,13 +930,6 @@
                                bias-pull-down;
                        };
 
-                       blsp_uart2_default: blsp-uart2-default-state {
-                               pins = "gpio4", "gpio5";
-                               function = "blsp_uart2";
-                               drive-strength = <16>;
-                               bias-disable;
-                       };
-
                        blsp_uart2_console_default: blsp-uart2-console-default-state {
                                tx-pins {
                                        pins = "gpio4";
@@ -969,7 +948,7 @@
                                };
                        };
 
-                       blsp_uart2_sleep: blsp_uart2_console_sleep: blsp-uart2-sleep-state {
+                       blsp_uart2_console_sleep: blsp-uart2-console-sleep-state {
                                pins = "gpio4", "gpio5";
                                function = "gpio";
                                drive-strength = <2>;