arm64: dts: qcom: msm8953: Re-sort tlmm pinctrl states

Follow the Devicetree Sources Coding Style and sort the pinctrl nodes by
the pins property. This makes it simpler to add new pinctrl states in
the future.

Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Signed-off-by: Luca Weiss <luca@lucaweiss.eu>
Link: https://lore.kernel.org/r/20251028-msm8953-cci-v2-4-b5f9f7135326@lucaweiss.eu
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/msm8953.dtsi b/arch/arm64/boot/dts/qcom/msm8953.dtsi
index 76317c5783496675a549815bbed71fd214590dd1..7884a3ed8aeff44e16f465c64be57648373c9ff9 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8953.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8953.dtsi
@@ -545,123 +545,6 @@
                        interrupt-controller;
                        #interrupt-cells = <2>;
 
-                       uart_console_active: uart-console-active-state {
-                               pins = "gpio4", "gpio5";
-                               function = "blsp_uart2";
-                               drive-strength = <2>;
-                               bias-disable;
-                       };
-
-                       uart_console_sleep: uart-console-sleep-state {
-                               pins = "gpio4", "gpio5";
-                               function = "blsp_uart2";
-                               drive-strength = <2>;
-                               bias-pull-down;
-                       };
-
-                       sdc1_clk_on: sdc1-clk-on-state {
-                               pins = "sdc1_clk";
-                               bias-disable;
-                               drive-strength = <16>;
-                       };
-
-                       sdc1_clk_off: sdc1-clk-off-state {
-                               pins = "sdc1_clk";
-                               bias-disable;
-                               drive-strength = <2>;
-                       };
-
-                       sdc1_cmd_on: sdc1-cmd-on-state {
-                               pins = "sdc1_cmd";
-                               bias-disable;
-                               drive-strength = <10>;
-                       };
-
-                       sdc1_cmd_off: sdc1-cmd-off-state {
-                               pins = "sdc1_cmd";
-                               bias-disable;
-                               drive-strength = <2>;
-                       };
-
-                       sdc1_data_on: sdc1-data-on-state {
-                               pins = "sdc1_data";
-                               bias-pull-up;
-                               drive-strength = <10>;
-                       };
-
-                       sdc1_data_off: sdc1-data-off-state {
-                               pins = "sdc1_data";
-                               bias-pull-up;
-                               drive-strength = <2>;
-                       };
-
-                       sdc1_rclk_on: sdc1-rclk-on-state {
-                               pins = "sdc1_rclk";
-                               bias-pull-down;
-                       };
-
-                       sdc1_rclk_off: sdc1-rclk-off-state {
-                               pins = "sdc1_rclk";
-                               bias-pull-down;
-                       };
-
-                       sdc2_clk_on: sdc2-clk-on-state {
-                               pins = "sdc2_clk";
-                               drive-strength = <16>;
-                               bias-disable;
-                       };
-
-                       sdc2_clk_off: sdc2-clk-off-state {
-                               pins = "sdc2_clk";
-                               bias-disable;
-                               drive-strength = <2>;
-                       };
-
-                       sdc2_cmd_on: sdc2-cmd-on-state {
-                               pins = "sdc2_cmd";
-                               bias-pull-up;
-                               drive-strength = <10>;
-                       };
-
-                       sdc2_cmd_off: sdc2-cmd-off-state {
-                               pins = "sdc2_cmd";
-                               bias-pull-up;
-                               drive-strength = <2>;
-                       };
-
-                       sdc2_data_on: sdc2-data-on-state {
-                               pins = "sdc2_data";
-                               bias-pull-up;
-                               drive-strength = <10>;
-                       };
-
-                       sdc2_data_off: sdc2-data-off-state {
-                               pins = "sdc2_data";
-                               bias-pull-up;
-                               drive-strength = <2>;
-                       };
-
-                       sdc2_cd_on: cd-on-state {
-                               pins = "gpio133";
-                               function = "gpio";
-                               drive-strength = <2>;
-                               bias-pull-up;
-                       };
-
-                       sdc2_cd_off: cd-off-state {
-                               pins = "gpio133";
-                               function = "gpio";
-                               drive-strength = <2>;
-                               bias-disable;
-                       };
-
-                       gpio_key_default: gpio-key-default-state {
-                               pins = "gpio85";
-                               function = "gpio";
-                               drive-strength = <2>;
-                               bias-pull-up;
-                       };
-
                        i2c_1_default: i2c-1-default-state {
                                pins = "gpio2", "gpio3";
                                function = "blsp_i2c1";
@@ -676,99 +559,29 @@
                                bias-disable;
                        };
 
-                       i2c_2_default: i2c-2-default-state {
-                               pins = "gpio6", "gpio7";
-                               function = "blsp_i2c2";
-                               drive-strength = <2>;
-                               bias-disable;
-                       };
-
-                       i2c_2_sleep: i2c-2-sleep-state {
-                               pins = "gpio6", "gpio7";
-                               function = "gpio";
-                               drive-strength = <2>;
-                               bias-disable;
-                       };
-
-                       i2c_3_default: i2c-3-default-state {
-                               pins = "gpio10", "gpio11";
-                               function = "blsp_i2c3";
-                               drive-strength = <2>;
-                               bias-disable;
-                       };
-
-                       i2c_3_sleep: i2c-3-sleep-state {
-                               pins = "gpio10", "gpio11";
-                               function = "gpio";
-                               drive-strength = <2>;
-                               bias-disable;
-                       };
-
-                       i2c_4_default: i2c-4-default-state {
-                               pins = "gpio14", "gpio15";
-                               function = "blsp_i2c4";
-                               drive-strength = <2>;
-                               bias-disable;
-                       };
-
-                       i2c_4_sleep: i2c-4-sleep-state {
-                               pins = "gpio14", "gpio15";
-                               function = "gpio";
-                               drive-strength = <2>;
-                               bias-disable;
-                       };
-
-                       i2c_5_default: i2c-5-default-state {
-                               pins = "gpio18", "gpio19";
-                               function = "blsp_i2c5";
-                               drive-strength = <2>;
-                               bias-disable;
-                       };
-
-                       i2c_5_sleep: i2c-5-sleep-state {
-                               pins = "gpio18", "gpio19";
-                               function = "gpio";
-                               drive-strength = <2>;
-                               bias-disable;
-                       };
-
-                       i2c_6_default: i2c-6-default-state {
-                               pins = "gpio22", "gpio23";
-                               function = "blsp_i2c6";
-                               drive-strength = <2>;
-                               bias-disable;
-                       };
-
-                       i2c_6_sleep: i2c-6-sleep-state {
-                               pins = "gpio22", "gpio23";
-                               function = "gpio";
-                               drive-strength = <2>;
-                               bias-disable;
-                       };
-
-                       i2c_7_default: i2c-7-default-state {
-                               pins = "gpio135", "gpio136";
-                               function = "blsp_i2c7";
+                       uart_console_active: uart-console-active-state {
+                               pins = "gpio4", "gpio5";
+                               function = "blsp_uart2";
                                drive-strength = <2>;
                                bias-disable;
                        };
 
-                       i2c_7_sleep: i2c-7-sleep-state {
-                               pins = "gpio135", "gpio136";
-                               function = "gpio";
+                       uart_console_sleep: uart-console-sleep-state {
+                               pins = "gpio4", "gpio5";
+                               function = "blsp_uart2";
                                drive-strength = <2>;
-                               bias-disable;
+                               bias-pull-down;
                        };
 
-                       i2c_8_default: i2c-8-default-state {
-                               pins = "gpio98", "gpio99";
-                               function = "blsp_i2c8";
+                       i2c_2_default: i2c-2-default-state {
+                               pins = "gpio6", "gpio7";
+                               function = "blsp_i2c2";
                                drive-strength = <2>;
                                bias-disable;
                        };
 
-                       i2c_8_sleep: i2c-8-sleep-state {
-                               pins = "gpio98", "gpio99";
+                       i2c_2_sleep: i2c-2-sleep-state {
+                               pins = "gpio6", "gpio7";
                                function = "gpio";
                                drive-strength = <2>;
                                bias-disable;
@@ -806,6 +619,34 @@
                                };
                        };
 
+                       i2c_3_default: i2c-3-default-state {
+                               pins = "gpio10", "gpio11";
+                               function = "blsp_i2c3";
+                               drive-strength = <2>;
+                               bias-disable;
+                       };
+
+                       i2c_3_sleep: i2c-3-sleep-state {
+                               pins = "gpio10", "gpio11";
+                               function = "gpio";
+                               drive-strength = <2>;
+                               bias-disable;
+                       };
+
+                       i2c_4_default: i2c-4-default-state {
+                               pins = "gpio14", "gpio15";
+                               function = "blsp_i2c4";
+                               drive-strength = <2>;
+                               bias-disable;
+                       };
+
+                       i2c_4_sleep: i2c-4-sleep-state {
+                               pins = "gpio14", "gpio15";
+                               function = "gpio";
+                               drive-strength = <2>;
+                               bias-disable;
+                       };
+
                        spi_5_default: spi-5-default-state {
                                cs-pins {
                                        pins = "gpio18";
@@ -838,6 +679,34 @@
                                };
                        };
 
+                       uart_5_default: uart-5-default-state {
+                               pins = "gpio16", "gpio17", "gpio18", "gpio19";
+                               function = "blsp_uart5";
+                               drive-strength = <16>;
+                               bias-disable;
+                       };
+
+                       uart_5_sleep: uart-5-sleep-state {
+                               pins = "gpio16", "gpio17", "gpio18", "gpio19";
+                               function = "gpio";
+                               drive-strength = <2>;
+                               bias-disable;
+                       };
+
+                       i2c_5_default: i2c-5-default-state {
+                               pins = "gpio18", "gpio19";
+                               function = "blsp_i2c5";
+                               drive-strength = <2>;
+                               bias-disable;
+                       };
+
+                       i2c_5_sleep: i2c-5-sleep-state {
+                               pins = "gpio18", "gpio19";
+                               function = "gpio";
+                               drive-strength = <2>;
+                               bias-disable;
+                       };
+
                        spi_6_default: spi-6-default-state {
                                cs-pins {
                                        pins = "gpio22";
@@ -870,6 +739,99 @@
                                };
                        };
 
+                       i2c_6_default: i2c-6-default-state {
+                               pins = "gpio22", "gpio23";
+                               function = "blsp_i2c6";
+                               drive-strength = <2>;
+                               bias-disable;
+                       };
+
+                       i2c_6_sleep: i2c-6-sleep-state {
+                               pins = "gpio22", "gpio23";
+                               function = "gpio";
+                               drive-strength = <2>;
+                               bias-disable;
+                       };
+
+                       wcnss_pin_a: wcnss-active-state {
+                               wcss-wlan2-pins {
+                                       pins = "gpio76";
+                                       function = "wcss_wlan2";
+                                       drive-strength = <6>;
+                                       bias-pull-up;
+                               };
+
+                               wcss-wlan1-pins {
+                                       pins = "gpio77";
+                                       function = "wcss_wlan1";
+                                       drive-strength = <6>;
+                                       bias-pull-up;
+                               };
+
+                               wcss-wlan0-pins {
+                                       pins = "gpio78";
+                                       function = "wcss_wlan0";
+                                       drive-strength = <6>;
+                                       bias-pull-up;
+                               };
+
+                               wcss-wlan-pins {
+                                       pins = "gpio79", "gpio80";
+                                       function = "wcss_wlan";
+                                       drive-strength = <6>;
+                                       bias-pull-up;
+                               };
+                       };
+
+                       gpio_key_default: gpio-key-default-state {
+                               pins = "gpio85";
+                               function = "gpio";
+                               drive-strength = <2>;
+                               bias-pull-up;
+                       };
+
+                       i2c_8_default: i2c-8-default-state {
+                               pins = "gpio98", "gpio99";
+                               function = "blsp_i2c8";
+                               drive-strength = <2>;
+                               bias-disable;
+                       };
+
+                       i2c_8_sleep: i2c-8-sleep-state {
+                               pins = "gpio98", "gpio99";
+                               function = "gpio";
+                               drive-strength = <2>;
+                               bias-disable;
+                       };
+
+                       sdc2_cd_on: cd-on-state {
+                               pins = "gpio133";
+                               function = "gpio";
+                               drive-strength = <2>;
+                               bias-pull-up;
+                       };
+
+                       sdc2_cd_off: cd-off-state {
+                               pins = "gpio133";
+                               function = "gpio";
+                               drive-strength = <2>;
+                               bias-disable;
+                       };
+
+                       i2c_7_default: i2c-7-default-state {
+                               pins = "gpio135", "gpio136";
+                               function = "blsp_i2c7";
+                               drive-strength = <2>;
+                               bias-disable;
+                       };
+
+                       i2c_7_sleep: i2c-7-sleep-state {
+                               pins = "gpio135", "gpio136";
+                               function = "gpio";
+                               drive-strength = <2>;
+                               bias-disable;
+                       };
+
                        spi_7_default: spi-7-default-state {
                                cs-pins {
                                        pins = "gpio136";
@@ -902,49 +864,86 @@
                                };
                        };
 
-                       uart_5_default: uart-5-default-state {
-                               pins = "gpio16", "gpio17", "gpio18", "gpio19";
-                               function = "blsp_uart5";
+                       sdc1_clk_on: sdc1-clk-on-state {
+                               pins = "sdc1_clk";
+                               bias-disable;
                                drive-strength = <16>;
+                       };
+
+                       sdc1_clk_off: sdc1-clk-off-state {
+                               pins = "sdc1_clk";
                                bias-disable;
+                               drive-strength = <2>;
                        };
 
-                       uart_5_sleep: uart-5-sleep-state {
-                               pins = "gpio16", "gpio17", "gpio18", "gpio19";
-                               function = "gpio";
+                       sdc1_cmd_on: sdc1-cmd-on-state {
+                               pins = "sdc1_cmd";
+                               bias-disable;
+                               drive-strength = <10>;
+                       };
+
+                       sdc1_cmd_off: sdc1-cmd-off-state {
+                               pins = "sdc1_cmd";
+                               bias-disable;
+                               drive-strength = <2>;
+                       };
+
+                       sdc1_data_on: sdc1-data-on-state {
+                               pins = "sdc1_data";
+                               bias-pull-up;
+                               drive-strength = <10>;
+                       };
+
+                       sdc1_data_off: sdc1-data-off-state {
+                               pins = "sdc1_data";
+                               bias-pull-up;
                                drive-strength = <2>;
+                       };
+
+                       sdc1_rclk_on: sdc1-rclk-on-state {
+                               pins = "sdc1_rclk";
+                               bias-pull-down;
+                       };
+
+                       sdc1_rclk_off: sdc1-rclk-off-state {
+                               pins = "sdc1_rclk";
+                               bias-pull-down;
+                       };
+
+                       sdc2_clk_on: sdc2-clk-on-state {
+                               pins = "sdc2_clk";
+                               drive-strength = <16>;
                                bias-disable;
                        };
 
-                       wcnss_pin_a: wcnss-active-state {
+                       sdc2_clk_off: sdc2-clk-off-state {
+                               pins = "sdc2_clk";
+                               bias-disable;
+                               drive-strength = <2>;
+                       };
 
-                               wcss-wlan2-pins {
-                                       pins = "gpio76";
-                                       function = "wcss_wlan2";
-                                       drive-strength = <6>;
-                                       bias-pull-up;
-                               };
+                       sdc2_cmd_on: sdc2-cmd-on-state {
+                               pins = "sdc2_cmd";
+                               bias-pull-up;
+                               drive-strength = <10>;
+                       };
 
-                               wcss-wlan1-pins {
-                                       pins = "gpio77";
-                                       function = "wcss_wlan1";
-                                       drive-strength = <6>;
-                                       bias-pull-up;
-                               };
+                       sdc2_cmd_off: sdc2-cmd-off-state {
+                               pins = "sdc2_cmd";
+                               bias-pull-up;
+                               drive-strength = <2>;
+                       };
 
-                               wcss-wlan0-pins {
-                                       pins = "gpio78";
-                                       function = "wcss_wlan0";
-                                       drive-strength = <6>;
-                                       bias-pull-up;
-                               };
+                       sdc2_data_on: sdc2-data-on-state {
+                               pins = "sdc2_data";
+                               bias-pull-up;
+                               drive-strength = <10>;
+                       };
 
-                               wcss-wlan-pins {
-                                       pins = "gpio79", "gpio80";
-                                       function = "wcss_wlan";
-                                       drive-strength = <6>;
-                                       bias-pull-up;
-                               };
+                       sdc2_data_off: sdc2-data-off-state {
+                               pins = "sdc2_data";
+                               bias-pull-up;
+                               drive-strength = <2>;
                        };
                };