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

Remove the generic UART pinctrl templates from msm8916.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-5-f345b7a53c91@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
index f12a5e2b1e8c2cce6e85b8444c97a7e0d7b7c58f..b0c594c5f236c9c1d334e6acfcaa7e41c1f9f3a5 100644 (file)
--- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
+++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
@@ -597,6 +597,21 @@
                "USR_LED_2_CTRL", /* GPIO 120 */
                "SB_HS_ID";
 
+       blsp_uart1_default: blsp-uart1-default-state {
+               /* TX, RX, CTS_N, RTS_N */
+               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;
+       };
+
        sdc2_cd_default: sdc2-cd-default-state {
                pins = "gpio38";
                function = "gpio";

diff --git a/arch/arm64/boot/dts/qcom/apq8016-schneider-hmibsc.dts b/arch/arm64/boot/dts/qcom/apq8016-schneider-hmibsc.dts
index 7a03893530c7b89705f5544491c14edd7120acdc..ce75046ffdac48a206d14499bc711f8f4a777fe5 100644 (file)
--- a/arch/arm64/boot/dts/qcom/apq8016-schneider-hmibsc.dts
+++ b/arch/arm64/boot/dts/qcom/apq8016-schneider-hmibsc.dts
@@ -373,6 +373,37 @@
                bias-disable;
        };
 
+       blsp_uart1_default: blsp-uart1-default-state {
+               /* TX, RX, CTS_N, RTS_N */
+               pins = "gpio0", "gpio1", "gpio2", "gpio3";
+               function = "blsp_uart1";
+               drive-strength = <16>;
+               bias-disable;
+               bootph-all;
+       };
+
+       blsp_uart1_sleep: blsp-uart1-sleep-state {
+               pins = "gpio0", "gpio1", "gpio2", "gpio3";
+               function = "gpio";
+               drive-strength = <2>;
+               bias-pull-down;
+       };
+
+       blsp_uart2_default: blsp-uart2-default-state {
+               /* TX, RX */
+               pins = "gpio4", "gpio5";
+               function = "blsp_uart2";
+               drive-strength = <16>;
+               bias-disable;
+       };
+
+       blsp_uart2_sleep: blsp-uart2-sleep-state {
+               pins = "gpio4", "gpio5";
+               function = "gpio";
+               drive-strength = <2>;
+               bias-pull-down;
+       };
+
        msm_key_volp_n_default: msm-key-volp-n-default-state {
                pins = "gpio107";
                function = "gpio";
@@ -469,10 +500,6 @@
        drive-strength = <16>;
 };
 
-&blsp_uart1_default {
-       bootph-all;
-};
-
 /* Enable CoreSight */
 &cti0 { status = "okay"; };
 &cti1 { status = "okay"; };

diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
index 07ae0b921afa1fec7350467cf1b299fe91112a60..de9fdc0dfc5f9b223ee252b80fc18d45c9bb6582 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -1232,21 +1232,6 @@
                                bias-pull-down;
                        };
 
-                       blsp_uart1_default: blsp-uart1-default-state {
-                               /* TX, RX, CTS_N, RTS_N */
-                               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";
@@ -1272,13 +1257,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";
@@ -1297,7 +1275,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>;