arm64: dts: qcom: msm8996: 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>
Reviewed-by: Konrad Dybcio <konrad.dybcio@somainline.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20221020225309.32116-2-krzysztof.kozlowski@linaro.org

diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dts b/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
index 7f10372178d653eefc5fca31b9000bc6c6a18ef3..1b0a01f1e23766b700ae368c7280a340d2de7598 100644 (file)
--- a/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
+++ b/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
@@ -422,82 +422,46 @@
                "NC", /* GPIO_148 */
                "NC"; /* GPIO_149 */
 
-       sdc2_cd_on: sdc2_cd_on {
-               mux {
-                       pins = "gpio38";
-                       function = "gpio";
-               };
-
-               config {
-                       pins = "gpio38";
-                       bias-pull-up;           /* pull up */
-                       drive-strength = <16>;  /* 16 MA */
-               };
+       sdc2_cd_on: sdc2-cd-on-state {
+               pins = "gpio38";
+               function = "gpio";
+               bias-pull-up;
+               drive-strength = <16>;
        };
 
-       sdc2_cd_off: sdc2_cd_off {
-               mux {
-                       pins = "gpio38";
-                       function = "gpio";
-               };
-
-               config {
-                       pins = "gpio38";
-                       bias-pull-up;           /* pull up */
-                       drive-strength = <2>;   /* 2 MA */
-               };
+       sdc2_cd_off: sdc2-cd-off-state {
+               pins = "gpio38";
+               function = "gpio";
+               bias-pull-up;
+               drive-strength = <2>;
        };
 
-       hdmi_hpd_active: hdmi_hpd_active {
-               mux {
-                       pins = "gpio34";
-                       function = "hdmi_hot";
-               };
-
-               config {
-                       pins = "gpio34";
-                       bias-pull-down;
-                       drive-strength = <16>;
-               };
+       hdmi_hpd_active: hdmi-hpd-active-state {
+               pins = "gpio34";
+               function = "hdmi_hot";
+               bias-pull-down;
+               drive-strength = <16>;
        };
 
-       hdmi_hpd_suspend: hdmi_hpd_suspend {
-               mux {
-                       pins = "gpio34";
-                       function = "hdmi_hot";
-               };
-
-               config {
-                       pins = "gpio34";
-                       bias-pull-down;
-                       drive-strength = <2>;
-               };
+       hdmi_hpd_suspend: hdmi-hpd-suspend-state {
+               pins = "gpio34";
+               function = "hdmi_hot";
+               bias-pull-down;
+               drive-strength = <2>;
        };
 
-       hdmi_ddc_active: hdmi_ddc_active {
-               mux {
-                       pins = "gpio32", "gpio33";
-                       function = "hdmi_ddc";
-               };
-
-               config {
-                       pins = "gpio32", "gpio33";
-                       drive-strength = <2>;
-                       bias-pull-up;
-               };
+       hdmi_ddc_active: hdmi-ddc-active-state {
+               pins = "gpio32", "gpio33";
+               function = "hdmi_ddc";
+               drive-strength = <2>;
+               bias-pull-up;
        };
 
-       hdmi_ddc_suspend: hdmi_ddc_suspend {
-               mux {
-                       pins = "gpio32", "gpio33";
-                       function = "hdmi_ddc";
-               };
-
-               config {
-                       pins = "gpio32", "gpio33";
-                       drive-strength = <2>;
-                       bias-pull-down;
-               };
+       hdmi_ddc_suspend: hdmi-ddc-suspend-state {
+               pins = "gpio32", "gpio33";
+               function = "hdmi_ddc";
+               drive-strength = <2>;
+               bias-pull-down;
        };
 };
 

diff --git a/arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts b/arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts
index 3ea793b20e7f245ff0aea6b82881e5f086382c7a..71e0a500599c88a8045651433b1e5c48e84e8528 100644 (file)
--- a/arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts
+++ b/arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts
@@ -104,60 +104,22 @@
        status = "okay";
 };
 
-&tlmm {
-       sdc2_pins_default: sdc2-pins-default {
-               clk {
-                       pins = "sdc2_clk";
-                       bias-disable;
-                       drive-strength = <16>;
-               };
-
-               cmd {
-                       pins = "sdc2_cmd";
-                       bias-pull-up;
-                       drive-strength = <10>;
-               };
-
-               data {
-                       pins = "sdc2_data";
-                       bias-pull-up;
-                       drive-strength = <10>;
-               };
+&sdc2_state_on {
+       cd-pins {
+               pins = "gpio38";
+               function = "gpio";
 
-               cd {
-                       pins = "gpio38";
-                       function = "gpio";
-
-                       bias-pull-up;
-                       drive-strength = <16>;
-               };
+               bias-pull-up;
+               drive-strength = <16>;
        };
+};
 
-       sdc2_pins_sleep: sdc2-pins-sleep {
-               clk {
-                       pins = "sdc2_clk";
-                       bias-disable;
-                       drive-strength = <2>;
-               };
-
-               cmd {
-                       pins = "sdc2_cmd";
-                       bias-pull-up;
-                       drive-strength = <2>;
-               };
-
-               data {
-                       pins = "sdc2_data";
-                       bias-pull-up;
-                       drive-strength = <2>;
-               };
-
-               cd {
-                       pins = "gpio38";
-                       function = "gpio";
-                       bias-pull-up;
-                       drive-strength = <2>;
-               };
+&sdc2_state_off {
+       cd-pins {
+               pins = "gpio38";
+               function = "gpio";
+               bias-pull-up;
+               drive-strength = <2>;
        };
 };
 
@@ -372,10 +334,6 @@
 
        vmmc-supply = <&vreg_l21a_2p95>;
        vqmmc-supply = <&vreg_l13a_2p95>;
-
-       pinctrl-names = "default", "sleep";
-       pinctrl-0 = <&sdc2_pins_default>;
-       pinctrl-1 = <&sdc2_pins_sleep>;
 };
 
 &ufshc {

diff --git a/arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi b/arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi
index cb9a169bb38bece6e929f4f39db0e79e21d92c28..dec361b93cceaebd3226de48abad7c1f04f6e0bd 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi
@@ -847,28 +847,28 @@
        pinctrl-0 = <&sw_service_gpio>;
        pinctrl-names = "default";
 
-       disp_reset_n_gpio: disp-reset-n {
+       disp_reset_n_gpio: disp-reset-n-state {
                pins = "gpio8";
                function = "gpio";
                drive-strength = <2>;
                bias-disable;
        };
 
-       mdp_vsync_p_gpio: mdp-vsync-p {
+       mdp_vsync_p_gpio: mdp-vsync-p-state {
                pins = "gpio10";
                function = "mdp_vsync";
                drive-strength = <2>;
                bias-disable;
        };
 
-       sw_service_gpio: sw-service-gpio {
+       sw_service_gpio: sw-service-gpio-state {
                pins = "gpio16";
                function = "gpio";
                drive-strength = <2>;
                bias-pull-up;
        };
 
-       usb_detect: usb-detect {
+       usb_detect: usb-detect-state {
                pins = "gpio25";
                function = "gpio";
                drive-strength = <2>;
@@ -876,7 +876,7 @@
                output-high;
        };
 
-       uim_detect_en: uim-detect-en {
+       uim_detect_en: uim-detect-en-state {
                pins = "gpio29";
                function = "gpio";
                drive-strength = <2>;
@@ -884,14 +884,14 @@
                output-high;
        };
 
-       tray_det_pin: tray-det {
+       tray_det_pin: tray-det-state {
                pins = "gpio40";
                function = "gpio";
                drive-strength = <2>;
                bias-disable;
        };
 
-       tp_vddio_en: tp-vddio-en {
+       tp_vddio_en: tp-vddio-en-state {
                pins = "gpio50";
                function = "gpio";
                drive-strength = <2>;
@@ -899,7 +899,7 @@
                output-high;
        };
 
-       lcd_vddio_en: lcd-vddio-en {
+       lcd_vddio_en: lcd-vddio-en-state {
                pins = "gpio51";
                function = "gpio";
                drive-strength = <2>;
@@ -907,14 +907,14 @@
                output-low;
        };
 
-       wl_host_wake: wl-host-wake {
+       wl_host_wake: wl-host-wake-state {
                pins = "gpio79";
                function = "gpio";
                drive-strength = <2>;
                bias-pull-down;
        };
 
-       wl_reg_on: wl-reg-on {
+       wl_reg_on: wl-reg-on-state {
                pins = "gpio84";
                function = "gpio";
                drive-strength = <2>;
@@ -922,20 +922,20 @@
                output-low;
        };
 
-       ts_reset_n: ts-rst-n {
+       ts_reset_n: ts-rst-n-state {
                pins = "gpio89";
                function = "gpio";
                drive-strength = <2>;
        };
 
-       touch_int_n: touch-int-n {
+       touch_int_n: touch-int-n-state {
                pins = "gpio125";
                function = "gpio";
                drive-strength = <2>;
                bias-pull-up;
        };
 
-       touch_int_sleep: touch-int-sleep {
+       touch_int_sleep: touch-int-sleep-state {
                pins = "gpio125";
                function = "gpio";
                drive-strength = <2>;

diff --git a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi
index d2637909a356bb40a2c1b2baeac0a58fc5228774..5b47b8de69da69d735241f73c35fcf71c8e10b66 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi
@@ -691,35 +691,35 @@
 };
 
 &tlmm {
-       mdss_dsi_default: mdss_dsi_default {
+       mdss_dsi_default: mdss-dsi-default-state {
                pins = "gpio8";
                function = "gpio";
                drive-strength = <8>;
                bias-disable;
        };
 
-       mdss_dsi_sleep: mdss_dsi_sleep {
+       mdss_dsi_sleep: mdss-dsi-sleep-state {
                pins = "gpio8";
                function = "gpio";
                drive-strength = <2>;
                bias-pull-down;
        };
 
-       mdss_te_default: mdss_te_default {
+       mdss_te_default: mdss-te-default-state {
                pins = "gpio10";
                function = "mdp_vsync";
                drive-strength = <2>;
                bias-pull-down;
        };
 
-       mdss_te_sleep: mdss_te_sleep {
+       mdss_te_sleep: mdss-te-sleep-state {
                pins = "gpio10";
                function = "mdp_vsync";
                drive-strength = <2>;
                bias-pull-down;
        };
 
-       nfc_default: nfc_default {
+       nfc_default: nfc-default-state {
                pins = "gpio12", "gpio21";
                function = "gpio";
                drive-strength = <16>;

diff --git a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts
index 40f964ae80db334f68ea5986222bba4feb6a3f02..d8734913482f98f9bd5e392017e1bf462970dcaf 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts
+++ b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts
@@ -446,28 +446,28 @@
                "RFFE1_DATA",           /* GPIO_148 */
                "RFFE1_CLK";            /* GPIO_149 */
 
-       touchscreen_default: touchscreen_default {
+       touchscreen_default: touchscreen-default-state {
                pins = "gpio89", "gpio125";
                function = "gpio";
                drive-strength = <10>;
                bias-pull-up;
        };
 
-       touchscreen_sleep: touchscreen_sleep {
+       touchscreen_sleep: touchscreen-sleep-state {
                pins = "gpio89", "gpio125";
                function = "gpio";
                drive-strength = <2>;
                bias-disable;
        };
 
-       vibrator_default: vibrator_default {
+       vibrator_default: vibrator-default-state {
                pins = "gpio93";
                function = "gpio";
                drive-strength = <8>;
                bias-pull-up;
        };
 
-       vibrator_sleep: vibrator_sleep {
+       vibrator_sleep: vibrator-sleep-state {
                pins = "gpio93";
                function = "gpio";
                drive-strength = <2>;

diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
index 7f24c6a33ace74637ee23faada2ce2374dd6ddc6..b7e4fbf5744d62968f7408770cdda7421d483b20 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
@@ -1280,15 +1280,15 @@
                        interrupt-controller;
                        #interrupt-cells = <2>;
 
-                       blsp1_spi1_default: blsp1-spi1-default {
-                               spi {
+                       blsp1_spi1_default: blsp1-spi1-default-state {
+                               spi-pins {
                                        pins = "gpio0", "gpio1", "gpio3";
                                        function = "blsp_spi1";
                                        drive-strength = <12>;
                                        bias-disable;
                                };
 
-                               cs {
+                               cs-pins {
                                        pins = "gpio2";
                                        function = "gpio";
                                        drive-strength = <16>;
@@ -1297,42 +1297,42 @@
                                };
                        };
 
-                       blsp1_spi1_sleep: blsp1-spi1-sleep {
+                       blsp1_spi1_sleep: blsp1-spi1-sleep-state {
                                pins = "gpio0", "gpio1", "gpio2", "gpio3";
                                function = "gpio";
                                drive-strength = <2>;
                                bias-pull-down;
                        };
 
-                       blsp2_uart2_2pins_default: blsp2-uart1-2pins {
+                       blsp2_uart2_2pins_default: blsp2-uart1-2pins-state {
                                pins = "gpio4", "gpio5";
                                function = "blsp_uart8";
                                drive-strength = <16>;
                                bias-disable;
                        };
 
-                       blsp2_uart2_2pins_sleep: blsp2-uart1-2pins-sleep {
+                       blsp2_uart2_2pins_sleep: blsp2-uart1-2pins-sleep-state {
                                pins = "gpio4", "gpio5";
                                function = "gpio";
                                drive-strength = <2>;
                                bias-disable;
                        };
 
-                       blsp2_i2c2_default: blsp2-i2c2 {
+                       blsp2_i2c2_default: blsp2-i2c2-state {
                                pins = "gpio6", "gpio7";
                                function = "blsp_i2c8";
                                drive-strength = <16>;
                                bias-disable;
                        };
 
-                       blsp2_i2c2_sleep: blsp2-i2c2-sleep {
+                       blsp2_i2c2_sleep: blsp2-i2c2-sleep-state {
                                pins = "gpio6", "gpio7";
                                function = "gpio";
                                drive-strength = <2>;
                                bias-disable;
                        };
 
-                       cci0_default: cci0-default {
+                       cci0_default: cci0-default-state {
                                pins = "gpio17", "gpio18";
                                function = "cci_i2c";
                                drive-strength = <16>;
@@ -1340,22 +1340,22 @@
                        };
 
                        camera0_state_on:
-                       camera_rear_default: camera-rear-default {
-                               camera0_mclk: mclk0 {
+                       camera_rear_default: camera-rear-default-state {
+                               camera0_mclk: mclk0-pins {
                                        pins = "gpio13";
                                        function = "cam_mclk";
                                        drive-strength = <16>;
                                        bias-disable;
                                };
 
-                               camera0_rst: rst {
+                               camera0_rst: rst-pins {
                                        pins = "gpio25";
                                        function = "gpio";
                                        drive-strength = <16>;
                                        bias-disable;
                                };
 
-                               camera0_pwdn: pwdn {
+                               camera0_pwdn: pwdn-pins {
                                        pins = "gpio26";
                                        function = "gpio";
                                        drive-strength = <16>;
@@ -1363,7 +1363,7 @@
                                };
                        };
 
-                       cci1_default: cci1-default {
+                       cci1_default: cci1-default-state {
                                pins = "gpio19", "gpio20";
                                function = "cci_i2c";
                                drive-strength = <16>;
@@ -1371,22 +1371,22 @@
                        };
 
                        camera1_state_on:
-                       camera_board_default: camera-board-default {
-                               mclk1 {
+                       camera_board_default: camera-board-default-state {
+                               mclk1-pins {
                                        pins = "gpio14";
                                        function = "cam_mclk";
                                        drive-strength = <16>;
                                        bias-disable;
                                };
 
-                               pwdn {
+                               pwdn-pins {
                                        pins = "gpio98";
                                        function = "gpio";
                                        drive-strength = <16>;
                                        bias-disable;
                                };
 
-                               rst {
+                               rst-pins {
                                        pins = "gpio104";
                                        function = "gpio";
                                        drive-strength = <16>;
@@ -1395,22 +1395,22 @@
                        };
 
                        camera2_state_on:
-                       camera_front_default: camera-front-default {
-                               camera2_mclk: mclk2 {
+                       camera_front_default: camera-front-default-state {
+                               camera2_mclk: mclk2-pins {
                                        pins = "gpio15";
                                        function = "cam_mclk";
                                        drive-strength = <16>;
                                        bias-disable;
                                };
 
-                               camera2_rst: rst {
+                               camera2_rst: rst-pins {
                                        pins = "gpio23";
                                        function = "gpio";
                                        drive-strength = <16>;
                                        bias-disable;
                                };
 
-                               pwdn {
+                               pwdn-pins {
                                        pins = "gpio133";
                                        function = "gpio";
                                        drive-strength = <16>;
@@ -1418,22 +1418,22 @@
                                };
                        };
 
-                       pcie0_state_on: pcie0-state-on {
-                               perst {
+                       pcie0_state_on: pcie0-state-on-state {
+                               perst-pins {
                                        pins = "gpio35";
                                        function = "gpio";
                                        drive-strength = <2>;
                                        bias-pull-down;
                                };
 
-                               clkreq {
+                               clkreq-pins {
                                        pins = "gpio36";
                                        function = "pci_e0";
                                        drive-strength = <2>;
                                        bias-pull-up;
                                };
 
-                               wake {
+                               wake-pins {
                                        pins = "gpio37";
                                        function = "gpio";
                                        drive-strength = <2>;
@@ -1441,22 +1441,22 @@
                                };
                        };
 
-                       pcie0_state_off: pcie0-state-off {
-                               perst {
+                       pcie0_state_off: pcie0-state-off-state {
+                               perst-pins {
                                        pins = "gpio35";
                                        function = "gpio";
                                        drive-strength = <2>;
                                        bias-pull-down;
                                };
 
-                               clkreq {
+                               clkreq-pins {
                                        pins = "gpio36";
                                        function = "gpio";
                                        drive-strength = <2>;
                                        bias-disable;
                                };
 
-                               wake {
+                               wake-pins {
                                        pins = "gpio37";
                                        function = "gpio";
                                        drive-strength = <2>;
@@ -1464,63 +1464,63 @@
                                };
                        };
 
-                       blsp1_uart2_default: blsp1-uart2-default {
+                       blsp1_uart2_default: blsp1-uart2-default-state {
                                pins = "gpio41", "gpio42", "gpio43", "gpio44";
                                function = "blsp_uart2";
                                drive-strength = <16>;
                                bias-disable;
                        };
 
-                       blsp1_uart2_sleep: blsp1-uart2-sleep {
+                       blsp1_uart2_sleep: blsp1-uart2-sleep-state {
                                pins = "gpio41", "gpio42", "gpio43", "gpio44";
                                function = "gpio";
                                drive-strength = <2>;
                                bias-disable;
                        };
 
-                       blsp1_i2c3_default: blsp1-i2c2-default {
+                       blsp1_i2c3_default: blsp1-i2c2-default-state {
                                pins = "gpio47", "gpio48";
                                function = "blsp_i2c3";
                                drive-strength = <16>;
                                bias-disable;
                        };
 
-                       blsp1_i2c3_sleep: blsp1-i2c2-sleep {
+                       blsp1_i2c3_sleep: blsp1-i2c2-sleep-state {
                                pins = "gpio47", "gpio48";
                                function = "gpio";
                                drive-strength = <2>;
                                bias-disable;
                        };
 
-                       blsp2_uart3_4pins_default: blsp2-uart2-4pins {
+                       blsp2_uart3_4pins_default: blsp2-uart2-4pins-state {
                                pins = "gpio49", "gpio50", "gpio51", "gpio52";
                                function = "blsp_uart9";
                                drive-strength = <16>;
                                bias-disable;
                        };
 
-                       blsp2_uart3_4pins_sleep: blsp2-uart2-4pins-sleep {
+                       blsp2_uart3_4pins_sleep: blsp2-uart2-4pins-sleep-state {
                                pins = "gpio49", "gpio50", "gpio51", "gpio52";
                                function = "blsp_uart9";
                                drive-strength = <2>;
                                bias-disable;
                        };
 
-                       blsp2_i2c3_default: blsp2-i2c3 {
+                       blsp2_i2c3_default: blsp2-i2c3-state-state {
                                pins = "gpio51", "gpio52";
                                function = "blsp_i2c9";
                                drive-strength = <16>;
                                bias-disable;
                        };
 
-                       blsp2_i2c3_sleep: blsp2-i2c3-sleep {
+                       blsp2_i2c3_sleep: blsp2-i2c3-sleep-state {
                                pins = "gpio51", "gpio52";
                                function = "gpio";
                                drive-strength = <2>;
                                bias-disable;
                        };
 
-                       wcd_intr_default: wcd-intr-default {
+                       wcd_intr_default: wcd-intr-default-state {
                                pins = "gpio54";
                                function = "gpio";
                                drive-strength = <2>;
@@ -1528,21 +1528,21 @@
                                input-enable;
                        };
 
-                       blsp2_i2c1_default: blsp2-i2c1 {
+                       blsp2_i2c1_default: blsp2-i2c1-state {
                                pins = "gpio55", "gpio56";
                                function = "blsp_i2c7";
                                drive-strength = <16>;
                                bias-disable;
                        };
 
-                       blsp2_i2c1_sleep: blsp2-i2c0-sleep {
+                       blsp2_i2c1_sleep: blsp2-i2c0-sleep-state {
                                pins = "gpio55", "gpio56";
                                function = "gpio";
                                drive-strength = <2>;
                                bias-disable;
                        };
 
-                       blsp2_i2c5_default: blsp2-i2c5 {
+                       blsp2_i2c5_default: blsp2-i2c5-state {
                                pins = "gpio60", "gpio61";
                                function = "blsp_i2c11";
                                drive-strength = <2>;
@@ -1551,7 +1551,7 @@
 
                        /* Sleep state for BLSP2_I2C5 is missing.. */
 
-                       cdc_reset_active: cdc-reset-active {
+                       cdc_reset_active: cdc-reset-active-state {
                                pins = "gpio64";
                                function = "gpio";
                                drive-strength = <16>;
@@ -1559,7 +1559,7 @@
                                output-high;
                        };
 
-                       cdc_reset_sleep: cdc-reset-sleep {
+                       cdc_reset_sleep: cdc-reset-sleep-state {
                                pins = "gpio64";
                                function = "gpio";
                                drive-strength = <16>;
@@ -1567,15 +1567,15 @@
                                output-low;
                        };
 
-                       blsp2_spi6_default: blsp2-spi5-default {
-                               spi {
+                       blsp2_spi6_default: blsp2-spi5-default-state {
+                               spi-pins {
                                        pins = "gpio85", "gpio86", "gpio88";
                                        function = "blsp_spi12";
                                        drive-strength = <12>;
                                        bias-disable;
                                };
 
-                               cs {
+                               cs-pins {
                                        pins = "gpio87";
                                        function = "gpio";
                                        drive-strength = <16>;
@@ -1584,43 +1584,43 @@
                                };
                        };
 
-                       blsp2_spi6_sleep: blsp2-spi5-sleep {
+                       blsp2_spi6_sleep: blsp2-spi5-sleep-state {
                                pins = "gpio85", "gpio86", "gpio87", "gpio88";
                                function = "gpio";
                                drive-strength = <2>;
                                bias-pull-down;
                        };
 
-                       blsp2_i2c6_default: blsp2-i2c6 {
+                       blsp2_i2c6_default: blsp2-i2c6-state {
                                pins = "gpio87", "gpio88";
                                function = "blsp_i2c12";
                                drive-strength = <16>;
                                bias-disable;
                        };
 
-                       blsp2_i2c6_sleep: blsp2-i2c6-sleep {
+                       blsp2_i2c6_sleep: blsp2-i2c6-sleep-state {
                                pins = "gpio87", "gpio88";
                                function = "gpio";
                                drive-strength = <2>;
                                bias-disable;
                        };
 
-                       pcie1_state_on: pcie1-state-on {
-                               perst {
+                       pcie1_state_on: pcie1-on-state {
+                               perst-pins {
                                        pins = "gpio130";
                                        function = "gpio";
                                        drive-strength = <2>;
                                        bias-pull-down;
                                };
 
-                               clkreq {
+                               clkreq-pins {
                                        pins = "gpio131";
                                        function = "pci_e1";
                                        drive-strength = <2>;
                                        bias-pull-up;
                                };
 
-                               wake {
+                               wake-pins {
                                        pins = "gpio132";
                                        function = "gpio";
                                        drive-strength = <2>;
@@ -1628,16 +1628,16 @@
                                };
                        };
 
-                       pcie1_state_off: pcie1-state-off {
+                       pcie1_state_off: pcie1-off-state {
                                /* Perst is missing? */
-                               clkreq {
+                               clkreq-pins {
                                        pins = "gpio131";
                                        function = "gpio";
                                        drive-strength = <2>;
                                        bias-disable;
                                };
 
-                               wake {
+                               wake-pins {
                                        pins = "gpio132";
                                        function = "gpio";
                                        drive-strength = <2>;
@@ -1645,22 +1645,22 @@
                                };
                        };
 
-                       pcie2_state_on: pcie2-state-on {
-                               perst {
+                       pcie2_state_on: pcie2-on-state {
+                               perst-pins {
                                        pins = "gpio114";
                                        function = "gpio";
                                        drive-strength = <2>;
                                        bias-pull-down;
                                };
 
-                               clkreq {
+                               clkreq-pins {
                                        pins = "gpio115";
                                        function = "pci_e2";
                                        drive-strength = <2>;
                                        bias-pull-up;
                                };
 
-                               wake {
+                               wake-pins {
                                        pins = "gpio116";
                                        function = "gpio";
                                        drive-strength = <2>;
@@ -1668,16 +1668,16 @@
                                };
                        };
 
-                       pcie2_state_off: pcie2-state-off {
+                       pcie2_state_off: pcie2-off-state {
                                /* Perst is missing? */
-                               clkreq {
+                               clkreq-pins {
                                        pins = "gpio115";
                                        function = "gpio";
                                        drive-strength = <2>;
                                        bias-disable;
                                };
 
-                               wake {
+                               wake-pins {
                                        pins = "gpio116";
                                        function = "gpio";
                                        drive-strength = <2>;
@@ -1685,90 +1685,90 @@
                                };
                        };
 
-                       sdc1_state_on: sdc1-state-on {
-                               clk {
+                       sdc1_state_on: sdc1-on-state {
+                               clk-pins {
                                        pins = "sdc1_clk";
                                        bias-disable;
                                        drive-strength = <16>;
                                };
 
-                               cmd {
+                               cmd-pins {
                                        pins = "sdc1_cmd";
                                        bias-pull-up;
                                        drive-strength = <10>;
                                };
 
-                               data {
+                               data-pins {
                                        pins = "sdc1_data";
                                        bias-pull-up;
                                        drive-strength = <10>;
                                };
 
-                               rclk {
+                               rclk-pins {
                                        pins = "sdc1_rclk";
                                        bias-pull-down;
                                };
                        };
 
-                       sdc1_state_off: sdc1-state-off {
-                               clk {
+                       sdc1_state_off: sdc1-off-state {
+                               clk-pins {
                                        pins = "sdc1_clk";
                                        bias-disable;
                                        drive-strength = <2>;
                                };
 
-                               cmd {
+                               cmd-pins {
                                        pins = "sdc1_cmd";
                                        bias-pull-up;
                                        drive-strength = <2>;
                                };
 
-                               data {
+                               data-pins {
                                        pins = "sdc1_data";
                                        bias-pull-up;
                                        drive-strength = <2>;
                                };
 
-                               rclk {
+                               rclk-pins {
                                        pins = "sdc1_rclk";
                                        bias-pull-down;
                                };
                        };
 
-                       sdc2_state_on: sdc2-clk-on {
-                               clk {
+                       sdc2_state_on: sdc2-on-state {
+                               clk-pins {
                                        pins = "sdc2_clk";
                                        bias-disable;
                                        drive-strength = <16>;
                                };
 
-                               cmd {
+                               cmd-pins {
                                        pins = "sdc2_cmd";
                                        bias-pull-up;
                                        drive-strength = <10>;
                                };
 
-                               data {
+                               data-pins {
                                        pins = "sdc2_data";
                                        bias-pull-up;
                                        drive-strength = <10>;
                                };
                        };
 
-                       sdc2_state_off: sdc2-clk-off {
-                               clk {
+                       sdc2_state_off: sdc2-off-state {
+                               clk-pins {
                                        pins = "sdc2_clk";
                                        bias-disable;
                                        drive-strength = <2>;
                                };
 
-                               cmd {
+                               cmd-pins {
                                        pins = "sdc2_cmd";
                                        bias-pull-up;
                                        drive-strength = <2>;
                                };
 
-                               data {
+                               data-pins {
                                        pins = "sdc2_data";
                                        bias-pull-up;
                                        drive-strength = <2>;

diff --git a/arch/arm64/boot/dts/qcom/msm8996pro-xiaomi-natrium.dts b/arch/arm64/boot/dts/qcom/msm8996pro-xiaomi-natrium.dts
index b18ee5c1f6789aafe12f27eebe70788ac4ce7c77..d18d0b0eda95e33ad4dcd7e1399ac816b7ef63e8 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8996pro-xiaomi-natrium.dts
+++ b/arch/arm64/boot/dts/qcom/msm8996pro-xiaomi-natrium.dts
@@ -399,14 +399,14 @@
                "RFFE1_DATA",           /* GPIO_148 */
                "RFFE1_CLK";            /* GPIO_149 */
 
-       touchscreen_default: touchscreen-default {
+       touchscreen_default: touchscreen-default-state {
                pins = "gpio89", "gpio125";
                function = "gpio";
                drive-strength = <10>;
                bias-pull-up;
        };
 
-       touchscreen_sleep: touchscreen-sleep {
+       touchscreen_sleep: touchscreen-sleep-state {
                pins = "gpio89", "gpio125";
                function = "gpio";
                drive-strength = <2>;

diff --git a/arch/arm64/boot/dts/qcom/msm8996pro-xiaomi-scorpio.dts b/arch/arm64/boot/dts/qcom/msm8996pro-xiaomi-scorpio.dts
index 7bf6ad1a214bdef7f52dc8731b99d7cf183ef6df..5e3b9130e9c2c9e58c334e5ff2a340b82bbfbcfe 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8996pro-xiaomi-scorpio.dts
+++ b/arch/arm64/boot/dts/qcom/msm8996pro-xiaomi-scorpio.dts
@@ -469,28 +469,28 @@
                "RFFE1_DATA",           /* GPIO_148 */
                "RFFE1_CLK";            /* GPIO_149 */
 
-       touchkey_default: touchkey_default {
+       touchkey_default: touchkey-default-state {
                pins = "gpio77";
                function = "gpio";
                drive-strength = <16>;
                bias-pull-up;
        };
 
-       touchkey_sleep: touchkey_sleep {
+       touchkey_sleep: touchkey-sleep-state {
                pins = "gpio77";
                function = "gpio";
                drive-strength = <2>;
                bias-disable;
        };
 
-       touchscreen_default: touchscreen_default {
+       touchscreen_default: touchscreen-default-state {
                pins = "gpio75", "gpio125";
                function = "gpio";
                drive-strength = <10>;
                bias-pull-up;
        };
 
-       touchscreen_sleep: touchscreen_sleep {
+       touchscreen_sleep: touchscreen-sleep-state {
                pins = "gpio75", "gpio125";
                function = "gpio";
                drive-strength = <2>;