arm64: dts: qcom: db820c: Move blsp1_uart2 pin states to msm8996.dtsi

Move blsp1_uart2_default and blsp1_uart2_sleep to the SoC device tree to
avoid duplicating them in other device trees.

Signed-off-by: Yassine Oudjana <y.oudjana@protonmail.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20210901193214.250375-2-y.oudjana@protonmail.com

diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi
index 51e1709..eca428a 100644 (file)
--- a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi
+++ b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi
@@ -148,9 +148,6 @@
 &blsp1_uart2 {
        label = "BT-UART";
        status = "okay";
-       pinctrl-names = "default", "sleep";
-       pinctrl-0 = <&blsp1_uart2_default>;
-       pinctrl-1 = <&blsp1_uart2_sleep>;
 
        bluetooth {
                compatible = "qcom,qca6174-bt";
@@ -437,32 +434,6 @@
                };
        };
 
-       blsp1_uart2_default: blsp1_uart2_default {
-               mux {
-                       pins = "gpio41", "gpio42", "gpio43", "gpio44";
-                       function = "blsp_uart2";
-               };
-
-               config {
-                       pins = "gpio41", "gpio42", "gpio43", "gpio44";
-                       drive-strength = <16>;
-                       bias-disable;
-               };
-       };
-
-       blsp1_uart2_sleep: blsp1_uart2_sleep {
-               mux {
-                       pins = "gpio41", "gpio42", "gpio43", "gpio44";
-                       function = "gpio";
-               };
-
-               config {
-                       pins = "gpio41", "gpio42", "gpio43", "gpio44";
-                       drive-strength = <2>;
-                       bias-disable;
-               };
-       };
-
        hdmi_hpd_active: hdmi_hpd_active {
                mux {
                        pins = "gpio34";

diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
index 52df22a..23c3435 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
@@ -1211,6 +1211,20 @@
                                };
                        };
 
+                       blsp1_uart2_default: blsp1-uart2-default {
+                               pins = "gpio41", "gpio42", "gpio43", "gpio44";
+                               function = "blsp_uart2";
+                               drive-strength = <16>;
+                               bias-disable;
+                       };
+
+                       blsp1_uart2_sleep: blsp1-uart2-sleep {
+                               pins = "gpio41", "gpio42", "gpio43", "gpio44";
+                               function = "gpio";
+                               drive-strength = <2>;
+                               bias-disable;
+                       };
+
                        blsp1_i2c3_default: blsp1-i2c2-default {
                                pins = "gpio47", "gpio48";
                                function = "blsp_i2c3";
@@ -2704,6 +2718,9 @@
                        clocks = <&gcc GCC_BLSP1_UART2_APPS_CLK>,
                                 <&gcc GCC_BLSP1_AHB_CLK>;
                        clock-names = "core", "iface";
+                       pinctrl-names = "default", "sleep";
+                       pinctrl-0 = <&blsp1_uart2_default>;
+                       pinctrl-1 = <&blsp1_uart2_sleep>;
                        dmas = <&blsp1_dma 2>, <&blsp1_dma 3>;
                        dma-names = "tx", "rx";
                        status = "disabled";