arm64: dts: qcom: msm8998: Merge in msm8998-pins.dtsi to msm8998.dtsi

This is the usual way of handling pin configuration upstream now, so
align to it.

Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
Tested-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@somainline.org>
Link: https://lore.kernel.org/r/20210109163001.146867-2-konrad.dybcio@somainline.org
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

diff --git a/arch/arm64/boot/dts/qcom/msm8998-pins.dtsi b/arch/arm64/boot/dts/qcom/msm8998-pins.dtsi
deleted file mode 100644 (file)
index 7c222cb..0000000
--- a/arch/arm64/boot/dts/qcom/msm8998-pins.dtsi
+++ /dev/null
@@ -1,108 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/* Copyright (c) 2018, The Linux Foundation. All rights reserved. */
-
-&tlmm {
-       sdc2_clk_on: sdc2_clk_on {
-               config {
-                       pins = "sdc2_clk";
-                       bias-disable;           /* NO pull */
-                       drive-strength = <16>;  /* 16 mA */
-               };
-       };
-
-       sdc2_clk_off: sdc2_clk_off {
-               config {
-                       pins = "sdc2_clk";
-                       bias-disable;           /* NO pull */
-                       drive-strength = <2>;   /* 2 mA */
-               };
-       };
-
-       sdc2_cmd_on: sdc2_cmd_on {
-               config {
-                       pins = "sdc2_cmd";
-                       bias-pull-up;           /* pull up */
-                       drive-strength = <10>;  /* 10 mA */
-               };
-       };
-
-       sdc2_cmd_off: sdc2_cmd_off {
-               config {
-                       pins = "sdc2_cmd";
-                       bias-pull-up;           /* pull up */
-                       drive-strength = <2>;   /* 2 mA */
-               };
-       };
-
-       sdc2_data_on: sdc2_data_on {
-               config {
-                       pins = "sdc2_data";
-                       bias-pull-up;           /* pull up */
-                       drive-strength = <10>;  /* 10 mA */
-               };
-       };
-
-       sdc2_data_off: sdc2_data_off {
-               config {
-                       pins = "sdc2_data";
-                       bias-pull-up;           /* pull up */
-                       drive-strength = <2>;   /* 2 mA */
-               };
-       };
-
-       sdc2_cd_on: sdc2_cd_on {
-               mux {
-                       pins = "gpio95";
-                       function = "gpio";
-               };
-
-               config {
-                       pins = "gpio95";
-                       bias-pull-up;           /* pull up */
-                       drive-strength = <2>;   /* 2 mA */
-               };
-       };
-
-       sdc2_cd_off: sdc2_cd_off {
-               mux {
-                       pins = "gpio95";
-                       function = "gpio";
-               };
-
-               config {
-                       pins = "gpio95";
-                       bias-pull-up;           /* pull up */
-                       drive-strength = <2>;   /* 2 mA */
-               };
-       };
-
-       blsp1_uart3_on: blsp1_uart3_on {
-               tx {
-                       pins = "gpio45";
-                       function = "blsp_uart3_a";
-                       drive-strength = <2>;
-                       bias-disable;
-               };
-
-               rx {
-                       pins = "gpio46";
-                       function = "blsp_uart3_a";
-                       drive-strength = <2>;
-                       bias-disable;
-               };
-
-               cts {
-                       pins = "gpio47";
-                       function = "blsp_uart3_a";
-                       drive-strength = <2>;
-                       bias-disable;
-               };
-
-               rfr {
-                       pins = "gpio48";
-                       function = "blsp_uart3_a";
-                       drive-strength = <2>;
-                       bias-disable;
-               };
-       };
-};

diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi
index ebdaaf1..699bd67 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8998.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi
@@ -1073,6 +1073,110 @@
                        #gpio-cells = <0x2>;
                        interrupt-controller;
                        #interrupt-cells = <0x2>;
+
+                       sdc2_clk_on: sdc2_clk_on {
+                               config {
+                                       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 {
+                                       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 {
+                                       pins = "sdc2_data";
+                                       bias-pull-up;
+                                       drive-strength = <10>;
+                               };
+                       };
+
+                       sdc2_data_off: sdc2_data_off {
+                               config {
+                                       pins = "sdc2_data";
+                                       bias-pull-up;
+                                       drive-strength = <2>;
+                               };
+                       };
+
+                       sdc2_cd_on: sdc2_cd_on {
+                               mux {
+                                       pins = "gpio95";
+                                       function = "gpio";
+                               };
+
+                               config {
+                                       pins = "gpio95";
+                                       bias-pull-up;
+                                       drive-strength = <2>;
+                               };
+                       };
+
+                       sdc2_cd_off: sdc2_cd_off {
+                               mux {
+                                       pins = "gpio95";
+                                       function = "gpio";
+                               };
+
+                               config {
+                                       pins = "gpio95";
+                                       bias-pull-up;
+                                       drive-strength = <2>;
+                               };
+                       };
+
+                       blsp1_uart3_on: blsp1_uart3_on {
+                               tx {
+                                       pins = "gpio45";
+                                       function = "blsp_uart3_a";
+                                       drive-strength = <2>;
+                                       bias-disable;
+                               };
+
+                               rx {
+                                       pins = "gpio46";
+                                       function = "blsp_uart3_a";
+                                       drive-strength = <2>;
+                                       bias-disable;
+                               };
+
+                               cts {
+                                       pins = "gpio47";
+                                       function = "blsp_uart3_a";
+                                       drive-strength = <2>;
+                                       bias-disable;
+                               };
+
+                               rfr {
+                                       pins = "gpio48";
+                                       function = "blsp_uart3_a";
+                                       drive-strength = <2>;
+                                       bias-disable;
+                               };
+                       };
                };
 
                remoteproc_mss: remoteproc@4080000 {
@@ -2110,5 +2214,3 @@
                };
        };
 };
-
-#include "msm8998-pins.dtsi"