arm64: dts: qcom: sm8350: align TLMM pin configuration with DT schema

DT schema expects TLMM pin configuration nodes to be named with '-state'
suffix and their optional children with '-pins' suffix.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20220912061746.6311-38-krzysztof.kozlowski@linaro.org

diff --git a/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi b/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi
index b702ab1605bb04e07b7b0ce6dce7dcc90c79a374..b3c9952ac1735048733d4867586d9f25107a41e9 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi
@@ -222,7 +222,7 @@
 &tlmm {
        gpio-reserved-ranges = <44 4>;
 
-       ts_int_default: ts-int-default {
+       ts_int_default: ts-int-default-state {
                pins = "gpio23";
                function = "gpio";
                drive-strength = <2>;

diff --git a/arch/arm64/boot/dts/qcom/sm8350.dtsi b/arch/arm64/boot/dts/qcom/sm8350.dtsi
index e72a04411888cb011eb18ac6374275e65fdcfbe3..cd5503642a231b841986cd24da4f78fc51c34c58 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8350.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8350.dtsi
@@ -1762,150 +1762,150 @@
                        wakeup-parent = <&pdc>;
 
                        qup_uart3_default_state: qup-uart3-default-state {
-                               rx {
+                               rx-pins {
                                        pins = "gpio18";
                                        function = "qup3";
                                };
-                               tx {
+                               tx-pins {
                                        pins = "gpio19";
                                        function = "qup3";
                                };
                        };
 
-                       qup_uart6_default: qup-uart6-default {
+                       qup_uart6_default: qup-uart6-default-state {
                                pins = "gpio30", "gpio31";
                                function = "qup6";
                                drive-strength = <2>;
                                bias-disable;
                        };
 
-                       qup_uart18_default: qup-uart18-default {
+                       qup_uart18_default: qup-uart18-default-state {
                                pins = "gpio58", "gpio59";
                                function = "qup18";
                                drive-strength = <2>;
                                bias-disable;
                        };
 
-                       qup_i2c0_default: qup-i2c0-default {
+                       qup_i2c0_default: qup-i2c0-default-state {
                                pins = "gpio4", "gpio5";
                                function = "qup0";
                                drive-strength = <2>;
                                bias-pull-up;
                        };
 
-                       qup_i2c1_default: qup-i2c1-default {
+                       qup_i2c1_default: qup-i2c1-default-state {
                                pins = "gpio8", "gpio9";
                                function = "qup1";
                                drive-strength = <2>;
                                bias-pull-up;
                        };
 
-                       qup_i2c2_default: qup-i2c2-default {
+                       qup_i2c2_default: qup-i2c2-default-state {
                                pins = "gpio12", "gpio13";
                                function = "qup2";
                                drive-strength = <2>;
                                bias-pull-up;
                        };
 
-                       qup_i2c4_default: qup-i2c4-default {
+                       qup_i2c4_default: qup-i2c4-default-state {
                                pins = "gpio20", "gpio21";
                                function = "qup4";
                                drive-strength = <2>;
                                bias-pull-up;
                        };
 
-                       qup_i2c5_default: qup-i2c5-default {
+                       qup_i2c5_default: qup-i2c5-default-state {
                                pins = "gpio24", "gpio25";
                                function = "qup5";
                                drive-strength = <2>;
                                bias-pull-up;
                        };
 
-                       qup_i2c6_default: qup-i2c6-default {
+                       qup_i2c6_default: qup-i2c6-default-state {
                                pins = "gpio28", "gpio29";
                                function = "qup6";
                                drive-strength = <2>;
                                bias-pull-up;
                        };
 
-                       qup_i2c7_default: qup-i2c7-default {
+                       qup_i2c7_default: qup-i2c7-default-state {
                                pins = "gpio32", "gpio33";
                                function = "qup7";
                                drive-strength = <2>;
                                bias-disable;
                        };
 
-                       qup_i2c8_default: qup-i2c8-default {
+                       qup_i2c8_default: qup-i2c8-default-state {
                                pins = "gpio36", "gpio37";
                                function = "qup8";
                                drive-strength = <2>;
                                bias-pull-up;
                        };
 
-                       qup_i2c9_default: qup-i2c9-default {
+                       qup_i2c9_default: qup-i2c9-default-state {
                                pins = "gpio40", "gpio41";
                                function = "qup9";
                                drive-strength = <2>;
                                bias-pull-up;
                        };
 
-                       qup_i2c10_default: qup-i2c10-default {
+                       qup_i2c10_default: qup-i2c10-default-state {
                                pins = "gpio44", "gpio45";
                                function = "qup10";
                                drive-strength = <2>;
                                bias-pull-up;
                        };
 
-                       qup_i2c11_default: qup-i2c11-default {
+                       qup_i2c11_default: qup-i2c11-default-state {
                                pins = "gpio48", "gpio49";
                                function = "qup11";
                                drive-strength = <2>;
                                bias-pull-up;
                        };
 
-                       qup_i2c12_default: qup-i2c12-default {
+                       qup_i2c12_default: qup-i2c12-default-state {
                                pins = "gpio52", "gpio53";
                                function = "qup12";
                                drive-strength = <2>;
                                bias-pull-up;
                        };
 
-                       qup_i2c13_default: qup-i2c13-default {
+                       qup_i2c13_default: qup-i2c13-default-state {
                                pins = "gpio0", "gpio1";
                                function = "qup13";
                                drive-strength = <2>;
                                bias-pull-up;
                        };
 
-                       qup_i2c14_default: qup-i2c14-default {
+                       qup_i2c14_default: qup-i2c14-default-state {
                                pins = "gpio56", "gpio57";
                                function = "qup14";
                                drive-strength = <2>;
                                bias-disable;
                        };
 
-                       qup_i2c15_default: qup-i2c15-default {
+                       qup_i2c15_default: qup-i2c15-default-state {
                                pins = "gpio60", "gpio61";
                                function = "qup15";
                                drive-strength = <2>;
                                bias-disable;
                        };
 
-                       qup_i2c16_default: qup-i2c16-default {
+                       qup_i2c16_default: qup-i2c16-default-state {
                                pins = "gpio64", "gpio65";
                                function = "qup16";
                                drive-strength = <2>;
                                bias-disable;
                        };
 
-                       qup_i2c17_default: qup-i2c17-default {
+                       qup_i2c17_default: qup-i2c17-default-state {
                                pins = "gpio72", "gpio73";
                                function = "qup17";
                                drive-strength = <2>;
                                bias-disable;
                        };
 
-                       qup_i2c19_default: qup-i2c19-default {
+                       qup_i2c19_default: qup-i2c19-default-state {
                                pins = "gpio76", "gpio77";
                                function = "qup19";
                                drive-strength = <2>;