arm64: dts: qcom: sm8250: align TLMM pin configuration with DT schema
authorKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Fri, 30 Sep 2022 19:29:39 +0000 (21:29 +0200)
committerBjorn Andersson <andersson@kernel.org>
Mon, 17 Oct 2022 18:16:44 +0000 (13:16 -0500)
DT schema expects TLMM pin configuration nodes to be named with
'-state' suffix and their optional children with '-pins' suffix.

Drop also unneeded split between mux and config.

Reviewed-by: Konrad Dybcio <konrad.dybcio@somainline.org>
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20220930192954.242546-2-krzysztof.kozlowski@linaro.org
arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
arch/arm64/boot/dts/qcom/sm8250-mtp.dts
arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi
arch/arm64/boot/dts/qcom/sm8250.dtsi

index d39ca36714777d52e5442738cc06a8d73e1843e2..69dda5ed7692aa5e49494471e08941fee86e1f2b 100644 (file)
                "HST_WLAN_UART_TX",
                "HST_WLAN_UART_RX";
 
-       lt9611_irq_pin: lt9611-irq {
+       lt9611_irq_pin: lt9611-irq-state {
                pins = "gpio63";
                function = "gpio";
                bias-disable;
        };
 
-       sdc2_default_state: sdc2-default {
-               clk {
+       sdc2_default_state: sdc2-default-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_card_det_n: sd-card-det-n {
+       sdc2_card_det_n: sd-card-det-n-state {
                pins = "gpio77";
                function = "gpio";
                bias-pull-up;
index a102aa5efa3266d33ef11ffec9d343f869430b41..9db6136321b42a681ad0ed9b89eb812c9462e031 100644 (file)
 &tlmm {
        gpio-reserved-ranges = <28 4>, <40 4>;
 
-       wcd938x_reset_default: wcd938x_reset_default {
-               mux {
-                       pins = "gpio32";
-                       function = "gpio";
-               };
-
-               config {
-                       pins = "gpio32";
-                       drive-strength = <16>;
-                       output-high;
-               };
-       };
-
-       wcd938x_reset_sleep: wcd938x_reset_sleep {
-               mux {
-                       pins = "gpio32";
-                       function = "gpio";
-               };
-
-               config {
-                       pins = "gpio32";
-                       drive-strength = <16>;
-                       bias-disable;
-                       output-low;
-               };
+       wcd938x_reset_default: wcd938x-reset-default-state {
+               pins = "gpio32";
+               function = "gpio";
+               drive-strength = <16>;
+               output-high;
+       };
+
+       wcd938x_reset_sleep: wcd938x-reset-sleep-state {
+               pins = "gpio32";
+               function = "gpio";
+               drive-strength = <16>;
+               bias-disable;
+               output-low;
        };
 };
 
index 549e0a2aa9fe4ff29d9a56d6dfeff183b53a5e77..72162852fae7a948f1ddc7a62552fc1381ee33e2 100644 (file)
 &tlmm {
        gpio-reserved-ranges = <40 4>, <52 4>;
 
-       sdc2_default_state: sdc2-default {
-               clk {
+       sdc2_default_state: sdc2-default-state {
+               clk-pins {
                        pins = "sdc2_clk";
                        drive-strength = <16>;
                        bias-disable;
                };
 
-               cmd {
+               cmd-pins {
                        pins = "sdc2_cmd";
                        drive-strength = <16>;
                        bias-pull-up;
                };
 
-               data {
+               data-pins {
                        pins = "sdc2_data";
                        drive-strength = <16>;
                        bias-pull-up;
                };
        };
 
-       mdm2ap_default: mdm2ap-default {
+       mdm2ap_default: mdm2ap-default-state {
                pins = "gpio1", "gpio3";
                function = "gpio";
                drive-strength = <8>;
                bias-disable;
        };
 
-       ts_int_default: ts-int-default {
+       ts_int_default: ts-int-default-state {
                pins = "gpio39";
                function = "gpio";
                drive-strength = <2>;
                input-enable;
        };
 
-       ap2mdm_default: ap2mdm-default {
+       ap2mdm_default: ap2mdm-default-state {
                pins = "gpio56", "gpio57";
                function = "gpio";
                drive-strength = <16>;
                bias-disable;
        };
 
-       sdc2_card_det_n: sd-card-det-n {
+       sdc2_card_det_n: sd-card-det-n-state {
                pins = "gpio77";
                function = "gpio";
                bias-pull-up;
index 98e7ff0647b8f9a8df3358fa54abeacd4b5c6d3d..87b75846367f562cfee493b15cbea20c2657e998 100644 (file)
                        gpio-ranges = <&tlmm 0 0 181>;
                        wakeup-parent = <&pdc>;
 
-                       cci0_default: cci0-default {
-                               cci0_i2c0_default: cci0-i2c0-default {
+                       cci0_default: cci0-default-state {
+                               cci0_i2c0_default: cci0-i2c0-default-pins {
                                        /* SDA, SCL */
                                        pins = "gpio101", "gpio102";
                                        function = "cci_i2c";
                                        drive-strength = <2>; /* 2 mA */
                                };
 
-                               cci0_i2c1_default: cci0-i2c1-default {
+                               cci0_i2c1_default: cci0-i2c1-default-pins {
                                        /* SDA, SCL */
                                        pins = "gpio103", "gpio104";
                                        function = "cci_i2c";
                                };
                        };
 
-                       cci0_sleep: cci0-sleep {
-                               cci0_i2c0_sleep: cci0-i2c0-sleep {
+                       cci0_sleep: cci0-sleep-state {
+                               cci0_i2c0_sleep: cci0-i2c0-sleep-pins {
                                        /* SDA, SCL */
                                        pins = "gpio101", "gpio102";
                                        function = "cci_i2c";
                                        bias-pull-down;
                                };
 
-                               cci0_i2c1_sleep: cci0-i2c1-sleep {
+                               cci0_i2c1_sleep: cci0-i2c1-sleep-pins {
                                        /* SDA, SCL */
                                        pins = "gpio103", "gpio104";
                                        function = "cci_i2c";
                                };
                        };
 
-                       cci1_default: cci1-default {
-                               cci1_i2c0_default: cci1-i2c0-default {
+                       cci1_default: cci1-default-state {
+                               cci1_i2c0_default: cci1-i2c0-default-pins {
                                        /* SDA, SCL */
                                        pins = "gpio105","gpio106";
                                        function = "cci_i2c";
                                        drive-strength = <2>; /* 2 mA */
                                };
 
-                               cci1_i2c1_default: cci1-i2c1-default {
+                               cci1_i2c1_default: cci1-i2c1-default-pins {
                                        /* SDA, SCL */
                                        pins = "gpio107","gpio108";
                                        function = "cci_i2c";
                                };
                        };
 
-                       cci1_sleep: cci1-sleep {
-                               cci1_i2c0_sleep: cci1-i2c0-sleep {
+                       cci1_sleep: cci1-sleep-state {
+                               cci1_i2c0_sleep: cci1-i2c0-sleep-pins {
                                        /* SDA, SCL */
                                        pins = "gpio105","gpio106";
                                        function = "cci_i2c";
                                        drive-strength = <2>; /* 2 mA */
                                };
 
-                               cci1_i2c1_sleep: cci1-i2c1-sleep {
+                               cci1_i2c1_sleep: cci1-i2c1-sleep-pins {
                                        /* SDA, SCL */
                                        pins = "gpio107","gpio108";
                                        function = "cci_i2c";
                                };
                        };
 
-                       pri_mi2s_active: pri-mi2s-active {
-                               sclk {
+                       pri_mi2s_active: pri-mi2s-active-state {
+                               sclk-pins {
                                        pins = "gpio138";
                                        function = "mi2s0_sck";
                                        drive-strength = <8>;
                                        bias-disable;
                                };
 
-                               ws {
+                               ws-pins {
                                        pins = "gpio141";
                                        function = "mi2s0_ws";
                                        drive-strength = <8>;
                                        output-high;
                                };
 
-                               data0 {
+                               data0-pins {
                                        pins = "gpio139";
                                        function = "mi2s0_data0";
                                        drive-strength = <8>;
                                        output-high;
                                };
 
-                               data1 {
+                               data1-pins {
                                        pins = "gpio140";
                                        function = "mi2s0_data1";
                                        drive-strength = <8>;
                                };
                        };
 
-                       qup_i2c0_default: qup-i2c0-default {
-                               mux {
-                                       pins = "gpio28", "gpio29";
-                                       function = "qup0";
-                               };
-
-                               config {
-                                       pins = "gpio28", "gpio29";
-                                       drive-strength = <2>;
-                                       bias-disable;
-                               };
+                       qup_i2c0_default: qup-i2c0-default-state {
+                               pins = "gpio28", "gpio29";
+                               function = "qup0";
+                               drive-strength = <2>;
+                               bias-disable;
                        };
 
-                       qup_i2c1_default: qup-i2c1-default {
-                               pinmux {
-                                       pins = "gpio4", "gpio5";
-                                       function = "qup1";
-                               };
-
-                               config {
-                                       pins = "gpio4", "gpio5";
-                                       drive-strength = <2>;
-                                       bias-disable;
-                               };
+                       qup_i2c1_default: qup-i2c1-default-state {
+                               pins = "gpio4", "gpio5";
+                               function = "qup1";
+                               drive-strength = <2>;
+                               bias-disable;
                        };
 
-                       qup_i2c2_default: qup-i2c2-default {
-                               mux {
-                                       pins = "gpio115", "gpio116";
-                                       function = "qup2";
-                               };
-
-                               config {
-                                       pins = "gpio115", "gpio116";
-                                       drive-strength = <2>;
-                                       bias-disable;
-                               };
+                       qup_i2c2_default: qup-i2c2-default-state {
+                               pins = "gpio115", "gpio116";
+                               function = "qup2";
+                               drive-strength = <2>;
+                               bias-disable;
                        };
 
-                       qup_i2c3_default: qup-i2c3-default {
-                               mux {
-                                       pins = "gpio119", "gpio120";
-                                       function = "qup3";
-                               };
-
-                               config {
-                                       pins = "gpio119", "gpio120";
-                                       drive-strength = <2>;
-                                       bias-disable;
-                               };
+                       qup_i2c3_default: qup-i2c3-default-state {
+                               pins = "gpio119", "gpio120";
+                               function = "qup3";
+                               drive-strength = <2>;
+                               bias-disable;
                        };
 
-                       qup_i2c4_default: qup-i2c4-default {
-                               mux {
-                                       pins = "gpio8", "gpio9";
-                                       function = "qup4";
-                               };
-
-                               config {
-                                       pins = "gpio8", "gpio9";
-                                       drive-strength = <2>;
-                                       bias-disable;
-                               };
+                       qup_i2c4_default: qup-i2c4-default-state {
+                               pins = "gpio8", "gpio9";
+                               function = "qup4";
+                               drive-strength = <2>;
+                               bias-disable;
                        };
 
-                       qup_i2c5_default: qup-i2c5-default {
-                               mux {
-                                       pins = "gpio12", "gpio13";
-                                       function = "qup5";
-                               };
-
-                               config {
-                                       pins = "gpio12", "gpio13";
-                                       drive-strength = <2>;
-                                       bias-disable;
-                               };
+                       qup_i2c5_default: qup-i2c5-default-state {
+                               pins = "gpio12", "gpio13";
+                               function = "qup5";
+                               drive-strength = <2>;
+                               bias-disable;
                        };
 
-                       qup_i2c6_default: qup-i2c6-default {
-                               mux {
-                                       pins = "gpio16", "gpio17";
-                                       function = "qup6";
-                               };
-
-                               config {
-                                       pins = "gpio16", "gpio17";
-                                       drive-strength = <2>;
-                                       bias-disable;
-                               };
+                       qup_i2c6_default: qup-i2c6-default-state {
+                               pins = "gpio16", "gpio17";
+                               function = "qup6";
+                               drive-strength = <2>;
+                               bias-disable;
                        };
 
-                       qup_i2c7_default: qup-i2c7-default {
-                               mux {
-                                       pins = "gpio20", "gpio21";
-                                       function = "qup7";
-                               };
-
-                               config {
-                                       pins = "gpio20", "gpio21";
-                                       drive-strength = <2>;
-                                       bias-disable;
-                               };
+                       qup_i2c7_default: qup-i2c7-default-state {
+                               pins = "gpio20", "gpio21";
+                               function = "qup7";
+                               drive-strength = <2>;
+                               bias-disable;
                        };
 
-                       qup_i2c8_default: qup-i2c8-default {
-                               mux {
-                                       pins = "gpio24", "gpio25";
-                                       function = "qup8";
-                               };
-
-                               config {
-                                       pins = "gpio24", "gpio25";
-                                       drive-strength = <2>;
-                                       bias-disable;
-                               };
+                       qup_i2c8_default: qup-i2c8-default-state {
+                               pins = "gpio24", "gpio25";
+                               function = "qup8";
+                               drive-strength = <2>;
+                               bias-disable;
                        };
 
-                       qup_i2c9_default: qup-i2c9-default {
-                               mux {
-                                       pins = "gpio125", "gpio126";
-                                       function = "qup9";
-                               };
-
-                               config {
-                                       pins = "gpio125", "gpio126";
-                                       drive-strength = <2>;
-                                       bias-disable;
-                               };
+                       qup_i2c9_default: qup-i2c9-default-state {
+                               pins = "gpio125", "gpio126";
+                               function = "qup9";
+                               drive-strength = <2>;
+                               bias-disable;
                        };
 
-                       qup_i2c10_default: qup-i2c10-default {
-                               mux {
-                                       pins = "gpio129", "gpio130";
-                                       function = "qup10";
-                               };
-
-                               config {
-                                       pins = "gpio129", "gpio130";
-                                       drive-strength = <2>;
-                                       bias-disable;
-                               };
+                       qup_i2c10_default: qup-i2c10-default-state {
+                               pins = "gpio129", "gpio130";
+                               function = "qup10";
+                               drive-strength = <2>;
+                               bias-disable;
                        };
 
-                       qup_i2c11_default: qup-i2c11-default {
-                               mux {
-                                       pins = "gpio60", "gpio61";
-                                       function = "qup11";
-                               };
-
-                               config {
-                                       pins = "gpio60", "gpio61";
-                                       drive-strength = <2>;
-                                       bias-disable;
-                               };
+                       qup_i2c11_default: qup-i2c11-default-state {
+                               pins = "gpio60", "gpio61";
+                               function = "qup11";
+                               drive-strength = <2>;
+                               bias-disable;
                        };
 
-                       qup_i2c12_default: qup-i2c12-default {
-                               mux {
-                                       pins = "gpio32", "gpio33";
-                                       function = "qup12";
-                               };
-
-                               config {
-                                       pins = "gpio32", "gpio33";
-                                       drive-strength = <2>;
-                                       bias-disable;
-                               };
+                       qup_i2c12_default: qup-i2c12-default-state {
+                               pins = "gpio32", "gpio33";
+                               function = "qup12";
+                               drive-strength = <2>;
+                               bias-disable;
                        };
 
-                       qup_i2c13_default: qup-i2c13-default {
-                               mux {
-                                       pins = "gpio36", "gpio37";
-                                       function = "qup13";
-                               };
-
-                               config {
-                                       pins = "gpio36", "gpio37";
-                                       drive-strength = <2>;
-                                       bias-disable;
-                               };
+                       qup_i2c13_default: qup-i2c13-default-state {
+                               pins = "gpio36", "gpio37";
+                               function = "qup13";
+                               drive-strength = <2>;
+                               bias-disable;
                        };
 
-                       qup_i2c14_default: qup-i2c14-default {
-                               mux {
-                                       pins = "gpio40", "gpio41";
-                                       function = "qup14";
-                               };
-
-                               config {
-                                       pins = "gpio40", "gpio41";
-                                       drive-strength = <2>;
-                                       bias-disable;
-                               };
+                       qup_i2c14_default: qup-i2c14-default-state {
+                               pins = "gpio40", "gpio41";
+                               function = "qup14";
+                               drive-strength = <2>;
+                               bias-disable;
                        };
 
-                       qup_i2c15_default: qup-i2c15-default {
-                               mux {
-                                       pins = "gpio44", "gpio45";
-                                       function = "qup15";
-                               };
-
-                               config {
-                                       pins = "gpio44", "gpio45";
-                                       drive-strength = <2>;
-                                       bias-disable;
-                               };
+                       qup_i2c15_default: qup-i2c15-default-state {
+                               pins = "gpio44", "gpio45";
+                               function = "qup15";
+                               drive-strength = <2>;
+                               bias-disable;
                        };
 
-                       qup_i2c16_default: qup-i2c16-default {
-                               mux {
-                                       pins = "gpio48", "gpio49";
-                                       function = "qup16";
-                               };
-
-                               config {
-                                       pins = "gpio48", "gpio49";
-                                       drive-strength = <2>;
-                                       bias-disable;
-                               };
+                       qup_i2c16_default: qup-i2c16-default-state {
+                               pins = "gpio48", "gpio49";
+                               function = "qup16";
+                               drive-strength = <2>;
+                               bias-disable;
                        };
 
-                       qup_i2c17_default: qup-i2c17-default {
-                               mux {
-                                       pins = "gpio52", "gpio53";
-                                       function = "qup17";
-                               };
-
-                               config {
-                                       pins = "gpio52", "gpio53";
-                                       drive-strength = <2>;
-                                       bias-disable;
-                               };
+                       qup_i2c17_default: qup-i2c17-default-state {
+                               pins = "gpio52", "gpio53";
+                               function = "qup17";
+                               drive-strength = <2>;
+                               bias-disable;
                        };
 
-                       qup_i2c18_default: qup-i2c18-default {
-                               mux {
-                                       pins = "gpio56", "gpio57";
-                                       function = "qup18";
-                               };
-
-                               config {
-                                       pins = "gpio56", "gpio57";
-                                       drive-strength = <2>;
-                                       bias-disable;
-                               };
+                       qup_i2c18_default: qup-i2c18-default-state {
+                               pins = "gpio56", "gpio57";
+                               function = "qup18";
+                               drive-strength = <2>;
+                               bias-disable;
                        };
 
-                       qup_i2c19_default: qup-i2c19-default {
-                               mux {
-                                       pins = "gpio0", "gpio1";
-                                       function = "qup19";
-                               };
-
-                               config {
-                                       pins = "gpio0", "gpio1";
-                                       drive-strength = <2>;
-                                       bias-disable;
-                               };
+                       qup_i2c19_default: qup-i2c19-default-state {
+                               pins = "gpio0", "gpio1";
+                               function = "qup19";
+                               drive-strength = <2>;
+                               bias-disable;
                        };
 
-                       qup_spi0_cs: qup-spi0-cs {
+                       qup_spi0_cs: qup-spi0-cs-state {
                                pins = "gpio31";
                                function = "qup0";
                        };
 
-                       qup_spi0_cs_gpio: qup-spi0-cs-gpio {
+                       qup_spi0_cs_gpio: qup-spi0-cs-gpio-state {
                                pins = "gpio31";
                                function = "gpio";
                        };
 
-                       qup_spi0_data_clk: qup-spi0-data-clk {
+                       qup_spi0_data_clk: qup-spi0-data-clk-state {
                                pins = "gpio28", "gpio29",
                                       "gpio30";
                                function = "qup0";
                        };
 
-                       qup_spi1_cs: qup-spi1-cs {
+                       qup_spi1_cs: qup-spi1-cs-state {
                                pins = "gpio7";
                                function = "qup1";
                        };
 
-                       qup_spi1_cs_gpio: qup-spi1-cs-gpio {
+                       qup_spi1_cs_gpio: qup-spi1-cs-gpio-state {
                                pins = "gpio7";
                                function = "gpio";
                        };
 
-                       qup_spi1_data_clk: qup-spi1-data-clk {
+                       qup_spi1_data_clk: qup-spi1-data-clk-state {
                                pins = "gpio4", "gpio5",
                                       "gpio6";
                                function = "qup1";
                        };
 
-                       qup_spi2_cs: qup-spi2-cs {
+                       qup_spi2_cs: qup-spi2-cs-state {
                                pins = "gpio118";
                                function = "qup2";
                        };
 
-                       qup_spi2_cs_gpio: qup-spi2-cs-gpio {
+                       qup_spi2_cs_gpio: qup-spi2-cs-gpio-state {
                                pins = "gpio118";
                                function = "gpio";
                        };
 
-                       qup_spi2_data_clk: qup-spi2-data-clk {
+                       qup_spi2_data_clk: qup-spi2-data-clk-state {
                                pins = "gpio115", "gpio116",
                                       "gpio117";
                                function = "qup2";
                        };
 
-                       qup_spi3_cs: qup-spi3-cs {
+                       qup_spi3_cs: qup-spi3-cs-state {
                                pins = "gpio122";
                                function = "qup3";
                        };
 
-                       qup_spi3_cs_gpio: qup-spi3-cs-gpio {
+                       qup_spi3_cs_gpio: qup-spi3-cs-gpio-state {
                                pins = "gpio122";
                                function = "gpio";
                        };
 
-                       qup_spi3_data_clk: qup-spi3-data-clk {
+                       qup_spi3_data_clk: qup-spi3-data-clk-state {
                                pins = "gpio119", "gpio120",
                                       "gpio121";
                                function = "qup3";
                        };
 
-                       qup_spi4_cs: qup-spi4-cs {
+                       qup_spi4_cs: qup-spi4-cs-state {
                                pins = "gpio11";
                                function = "qup4";
                        };
 
-                       qup_spi4_cs_gpio: qup-spi4-cs-gpio {
+                       qup_spi4_cs_gpio: qup-spi4-cs-gpio-state {
                                pins = "gpio11";
                                function = "gpio";
                        };
 
-                       qup_spi4_data_clk: qup-spi4-data-clk {
+                       qup_spi4_data_clk: qup-spi4-data-clk-state {
                                pins = "gpio8", "gpio9",
                                       "gpio10";
                                function = "qup4";
                        };
 
-                       qup_spi5_cs: qup-spi5-cs {
+                       qup_spi5_cs: qup-spi5-cs-state {
                                pins = "gpio15";
                                function = "qup5";
                        };
 
-                       qup_spi5_cs_gpio: qup-spi5-cs-gpio {
+                       qup_spi5_cs_gpio: qup-spi5-cs-gpio-state {
                                pins = "gpio15";
                                function = "gpio";
                        };
 
-                       qup_spi5_data_clk: qup-spi5-data-clk {
+                       qup_spi5_data_clk: qup-spi5-data-clk-state {
                                pins = "gpio12", "gpio13",
                                       "gpio14";
                                function = "qup5";
                        };
 
-                       qup_spi6_cs: qup-spi6-cs {
+                       qup_spi6_cs: qup-spi6-cs-state {
                                pins = "gpio19";
                                function = "qup6";
                        };
 
-                       qup_spi6_cs_gpio: qup-spi6-cs-gpio {
+                       qup_spi6_cs_gpio: qup-spi6-cs-gpio-state {
                                pins = "gpio19";
                                function = "gpio";
                        };
 
-                       qup_spi6_data_clk: qup-spi6-data-clk {
+                       qup_spi6_data_clk: qup-spi6-data-clk-state {
                                pins = "gpio16", "gpio17",
                                       "gpio18";
                                function = "qup6";
                        };
 
-                       qup_spi7_cs: qup-spi7-cs {
+                       qup_spi7_cs: qup-spi7-cs-state {
                                pins = "gpio23";
                                function = "qup7";
                        };
 
-                       qup_spi7_cs_gpio: qup-spi7-cs-gpio {
+                       qup_spi7_cs_gpio: qup-spi7-cs-gpio-state {
                                pins = "gpio23";
                                function = "gpio";
                        };
 
-                       qup_spi7_data_clk: qup-spi7-data-clk {
+                       qup_spi7_data_clk: qup-spi7-data-clk-state {
                                pins = "gpio20", "gpio21",
                                       "gpio22";
                                function = "qup7";
                        };
 
-                       qup_spi8_cs: qup-spi8-cs {
+                       qup_spi8_cs: qup-spi8-cs-state {
                                pins = "gpio27";
                                function = "qup8";
                        };
 
-                       qup_spi8_cs_gpio: qup-spi8-cs-gpio {
+                       qup_spi8_cs_gpio: qup-spi8-cs-gpio-state {
                                pins = "gpio27";
                                function = "gpio";
                        };
 
-                       qup_spi8_data_clk: qup-spi8-data-clk {
+                       qup_spi8_data_clk: qup-spi8-data-clk-state {
                                pins = "gpio24", "gpio25",
                                       "gpio26";
                                function = "qup8";
                        };
 
-                       qup_spi9_cs: qup-spi9-cs {
+                       qup_spi9_cs: qup-spi9-cs-state {
                                pins = "gpio128";
                                function = "qup9";
                        };
 
-                       qup_spi9_cs_gpio: qup-spi9-cs-gpio {
+                       qup_spi9_cs_gpio: qup-spi9-cs-gpio-state {
                                pins = "gpio128";
                                function = "gpio";
                        };
 
-                       qup_spi9_data_clk: qup-spi9-data-clk {
+                       qup_spi9_data_clk: qup-spi9-data-clk-state {
                                pins = "gpio125", "gpio126",
                                       "gpio127";
                                function = "qup9";
                        };
 
-                       qup_spi10_cs: qup-spi10-cs {
+                       qup_spi10_cs: qup-spi10-cs-state {
                                pins = "gpio132";
                                function = "qup10";
                        };
 
-                       qup_spi10_cs_gpio: qup-spi10-cs-gpio {
+                       qup_spi10_cs_gpio: qup-spi10-cs-gpio-state {
                                pins = "gpio132";
                                function = "gpio";
                        };
 
-                       qup_spi10_data_clk: qup-spi10-data-clk {
+                       qup_spi10_data_clk: qup-spi10-data-clk-state {
                                pins = "gpio129", "gpio130",
                                       "gpio131";
                                function = "qup10";
                        };
 
-                       qup_spi11_cs: qup-spi11-cs {
+                       qup_spi11_cs: qup-spi11-cs-state {
                                pins = "gpio63";
                                function = "qup11";
                        };
 
-                       qup_spi11_cs_gpio: qup-spi11-cs-gpio {
+                       qup_spi11_cs_gpio: qup-spi11-cs-gpio-state {
                                pins = "gpio63";
                                function = "gpio";
                        };
 
-                       qup_spi11_data_clk: qup-spi11-data-clk {
+                       qup_spi11_data_clk: qup-spi11-data-clk-state {
                                pins = "gpio60", "gpio61",
                                       "gpio62";
                                function = "qup11";
                        };
 
-                       qup_spi12_cs: qup-spi12-cs {
+                       qup_spi12_cs: qup-spi12-cs-state {
                                pins = "gpio35";
                                function = "qup12";
                        };
 
-                       qup_spi12_cs_gpio: qup-spi12-cs-gpio {
+                       qup_spi12_cs_gpio: qup-spi12-cs-gpio-state {
                                pins = "gpio35";
                                function = "gpio";
                        };
 
-                       qup_spi12_data_clk: qup-spi12-data-clk {
+                       qup_spi12_data_clk: qup-spi12-data-clk-state {
                                pins = "gpio32", "gpio33",
                                       "gpio34";
                                function = "qup12";
                        };
 
-                       qup_spi13_cs: qup-spi13-cs {
+                       qup_spi13_cs: qup-spi13-cs-state {
                                pins = "gpio39";
                                function = "qup13";
                        };
 
-                       qup_spi13_cs_gpio: qup-spi13-cs-gpio {
+                       qup_spi13_cs_gpio: qup-spi13-cs-gpio-state {
                                pins = "gpio39";
                                function = "gpio";
                        };
 
-                       qup_spi13_data_clk: qup-spi13-data-clk {
+                       qup_spi13_data_clk: qup-spi13-data-clk-state {
                                pins = "gpio36", "gpio37",
                                       "gpio38";
                                function = "qup13";
                        };
 
-                       qup_spi14_cs: qup-spi14-cs {
+                       qup_spi14_cs: qup-spi14-cs-state {
                                pins = "gpio43";
                                function = "qup14";
                        };
 
-                       qup_spi14_cs_gpio: qup-spi14-cs-gpio {
+                       qup_spi14_cs_gpio: qup-spi14-cs-gpio-state {
                                pins = "gpio43";
                                function = "gpio";
                        };
 
-                       qup_spi14_data_clk: qup-spi14-data-clk {
+                       qup_spi14_data_clk: qup-spi14-data-clk-state {
                                pins = "gpio40", "gpio41",
                                       "gpio42";
                                function = "qup14";
                        };
 
-                       qup_spi15_cs: qup-spi15-cs {
+                       qup_spi15_cs: qup-spi15-cs-state {
                                pins = "gpio47";
                                function = "qup15";
                        };
 
-                       qup_spi15_cs_gpio: qup-spi15-cs-gpio {
+                       qup_spi15_cs_gpio: qup-spi15-cs-gpio-state {
                                pins = "gpio47";
                                function = "gpio";
                        };
 
-                       qup_spi15_data_clk: qup-spi15-data-clk {
+                       qup_spi15_data_clk: qup-spi15-data-clk-state {
                                pins = "gpio44", "gpio45",
                                       "gpio46";
                                function = "qup15";
                        };
 
-                       qup_spi16_cs: qup-spi16-cs {
+                       qup_spi16_cs: qup-spi16-cs-state {
                                pins = "gpio51";
                                function = "qup16";
                        };
 
-                       qup_spi16_cs_gpio: qup-spi16-cs-gpio {
+                       qup_spi16_cs_gpio: qup-spi16-cs-gpio-state {
                                pins = "gpio51";
                                function = "gpio";
                        };
 
-                       qup_spi16_data_clk: qup-spi16-data-clk {
+                       qup_spi16_data_clk: qup-spi16-data-clk-state {
                                pins = "gpio48", "gpio49",
                                       "gpio50";
                                function = "qup16";
                        };
 
-                       qup_spi17_cs: qup-spi17-cs {
+                       qup_spi17_cs: qup-spi17-cs-state {
                                pins = "gpio55";
                                function = "qup17";
                        };
 
-                       qup_spi17_cs_gpio: qup-spi17-cs-gpio {
+                       qup_spi17_cs_gpio: qup-spi17-cs-gpio-state {
                                pins = "gpio55";
                                function = "gpio";
                        };
 
-                       qup_spi17_data_clk: qup-spi17-data-clk {
+                       qup_spi17_data_clk: qup-spi17-data-clk-state {
                                pins = "gpio52", "gpio53",
                                       "gpio54";
                                function = "qup17";
                        };
 
-                       qup_spi18_cs: qup-spi18-cs {
+                       qup_spi18_cs: qup-spi18-cs-state {
                                pins = "gpio59";
                                function = "qup18";
                        };
 
-                       qup_spi18_cs_gpio: qup-spi18-cs-gpio {
+                       qup_spi18_cs_gpio: qup-spi18-cs-gpio-state {
                                pins = "gpio59";
                                function = "gpio";
                        };
 
-                       qup_spi18_data_clk: qup-spi18-data-clk {
+                       qup_spi18_data_clk: qup-spi18-data-clk-state {
                                pins = "gpio56", "gpio57",
                                       "gpio58";
                                function = "qup18";
                        };
 
-                       qup_spi19_cs: qup-spi19-cs {
+                       qup_spi19_cs: qup-spi19-cs-state {
                                pins = "gpio3";
                                function = "qup19";
                        };
 
-                       qup_spi19_cs_gpio: qup-spi19-cs-gpio {
+                       qup_spi19_cs_gpio: qup-spi19-cs-gpio-state {
                                pins = "gpio3";
                                function = "gpio";
                        };
 
-                       qup_spi19_data_clk: qup-spi19-data-clk {
+                       qup_spi19_data_clk: qup-spi19-data-clk-state {
                                pins = "gpio0", "gpio1",
                                       "gpio2";
                                function = "qup19";
                        };
 
-                       qup_uart2_default: qup-uart2-default {
-                               mux {
-                                       pins = "gpio117", "gpio118";
-                                       function = "qup2";
-                               };
+                       qup_uart2_default: qup-uart2-default-state {
+                               pins = "gpio117", "gpio118";
+                               function = "qup2";
                        };
 
-                       qup_uart6_default: qup-uart6-default {
-                               mux {
-                                       pins = "gpio16", "gpio17",
-                                               "gpio18", "gpio19";
-                                       function = "qup6";
-                               };
+                       qup_uart6_default: qup-uart6-default-state {
+                               pins = "gpio16", "gpio17", "gpio18", "gpio19";
+                               function = "qup6";
                        };
 
-                       qup_uart12_default: qup-uart12-default {
-                               mux {
-                                       pins = "gpio34", "gpio35";
-                                       function = "qup12";
-                               };
+                       qup_uart12_default: qup-uart12-default-state {
+                               pins = "gpio34", "gpio35";
+                               function = "qup12";
                        };
 
-                       qup_uart17_default: qup-uart17-default {
-                               mux {
-                                       pins = "gpio52", "gpio53",
-                                               "gpio54", "gpio55";
-                                       function = "qup17";
-                               };
+                       qup_uart17_default: qup-uart17-default-state {
+                               pins = "gpio52", "gpio53", "gpio54", "gpio55";
+                               function = "qup17";
                        };
 
-                       qup_uart18_default: qup-uart18-default {
-                               mux {
-                                       pins = "gpio58", "gpio59";
-                                       function = "qup18";
-                               };
+                       qup_uart18_default: qup-uart18-default-state {
+                               pins = "gpio58", "gpio59";
+                               function = "qup18";
                        };
 
-                       tert_mi2s_active: tert-mi2s-active {
-                               sck {
+                       tert_mi2s_active: tert-mi2s-active-state {
+                               sck-pins {
                                        pins = "gpio133";
                                        function = "mi2s2_sck";
                                        drive-strength = <8>;
                                        bias-disable;
                                };
 
-                               data0 {
+                               data0-pins {
                                        pins = "gpio134";
                                        function = "mi2s2_data0";
                                        drive-strength = <8>;
                                        output-high;
                                };
 
-                               ws {
+                               ws-pins {
                                        pins = "gpio135";
                                        function = "mi2s2_ws";
                                        drive-strength = <8>;
                                };
                        };
 
-                       sdc2_sleep_state: sdc2-sleep {
-                               clk {
+                       sdc2_sleep_state: sdc2-sleep-state {
+                               clk-pins {
                                        pins = "sdc2_clk";
                                        drive-strength = <2>;
                                        bias-disable;
                                };
 
-                               cmd {
+                               cmd-pins {
                                        pins = "sdc2_cmd";
                                        drive-strength = <2>;
                                        bias-pull-up;
                                };
 
-                               data {
+                               data-pins {
                                        pins = "sdc2_data";
                                        drive-strength = <2>;
                                        bias-pull-up;
                                };
                        };
 
-                       pcie0_default_state: pcie0-default {
-                               perst {
+                       pcie0_default_state: pcie0-default-state {
+                               perst-pins {
                                        pins = "gpio79";
                                        function = "gpio";
                                        drive-strength = <2>;
                                        bias-pull-down;
                                };
 
-                               clkreq {
+                               clkreq-pins {
                                        pins = "gpio80";
                                        function = "pci_e0";
                                        drive-strength = <2>;
                                        bias-pull-up;
                                };
 
-                               wake {
+                               wake-pins {
                                        pins = "gpio81";
                                        function = "gpio";
                                        drive-strength = <2>;
                                };
                        };
 
-                       pcie1_default_state: pcie1-default {
-                               perst {
+                       pcie1_default_state: pcie1-default-state {
+                               perst-pins {
                                        pins = "gpio82";
                                        function = "gpio";
                                        drive-strength = <2>;
                                        bias-pull-down;
                                };
 
-                               clkreq {
+                               clkreq-pins {
                                        pins = "gpio83";
                                        function = "pci_e1";
                                        drive-strength = <2>;
                                        bias-pull-up;
                                };
 
-                               wake {
+                               wake-pins {
                                        pins = "gpio84";
                                        function = "gpio";
                                        drive-strength = <2>;
                                };
                        };
 
-                       pcie2_default_state: pcie2-default {
-                               perst {
+                       pcie2_default_state: pcie2-default-state {
+                               perst-pins {
                                        pins = "gpio85";
                                        function = "gpio";
                                        drive-strength = <2>;
                                        bias-pull-down;
                                };
 
-                               clkreq {
+                               clkreq-pins {
                                        pins = "gpio86";
                                        function = "pci_e2";
                                        drive-strength = <2>;
                                        bias-pull-up;
                                };
 
-                               wake {
+                               wake-pins {
                                        pins = "gpio87";
                                        function = "gpio";
                                        drive-strength = <2>;