arm64: dts: qcom: msm8916-*: Fix alphabetic node order

Fix a couple of instances of incorrectly sorted nodes in the MSM8916
boards. They should be ordered alphabetically for consistency.

No functional change.

Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
Link: https://lore.kernel.org/r/20230921-msm8916-rmem-fixups-v1-3-34d2b6e721cf@gerhold.net
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts b/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
index aa4c1ab..fade93c 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
@@ -58,10 +58,6 @@
        };
 };
 
-&blsp_uart2 {
-       status = "okay";
-};
-
 &blsp_i2c4 {
        status = "okay";
 
@@ -153,6 +149,10 @@
        };
 };
 
+&blsp_uart2 {
+       status = "okay";
+};
+
 &pm8916_resin {
        status = "okay";
        linux,code = <KEY_VOLUMEDOWN>;

diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts
index f5a8083..3b934f5 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts
@@ -49,11 +49,6 @@
        };
 };
 
-&touchkey {
-       vcc-supply = <&reg_touch_key>;
-       vdd-supply = <&reg_key_led>;
-};
-
 &accelerometer {
        mount-matrix = "0", "1", "0",
                       "1", "0", "0",
@@ -108,6 +103,11 @@
        remote-endpoint = <&panel_in>;
 };
 
+&touchkey {
+       vcc-supply = <&reg_touch_key>;
+       vdd-supply = <&reg_key_led>;
+};
+
 &vibrator {
        status = "okay";
 };

diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi
index c19cf20..6a16eb5 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi
@@ -65,25 +65,6 @@
        };
 };
 
-&blsp_i2c4 {
-       status = "okay";
-
-       fuelgauge@36 {
-               compatible = "maxim,max77849-battery";
-               reg = <0x36>;
-
-               maxim,rsns-microohm = <10000>;
-               maxim,over-heat-temp = <600>;
-               maxim,over-volt = <4400>;
-
-               interrupt-parent = <&tlmm>;
-               interrupts = <121 IRQ_TYPE_EDGE_FALLING>;
-
-               pinctrl-0 = <&fuelgauge_int_default>;
-               pinctrl-names = "default";
-       };
-};
-
 &blsp_i2c2 {
        status = "okay";
 
@@ -112,6 +93,25 @@
        };
 };
 
+&blsp_i2c4 {
+       status = "okay";
+
+       fuelgauge@36 {
+               compatible = "maxim,max77849-battery";
+               reg = <0x36>;
+
+               maxim,rsns-microohm = <10000>;
+               maxim,over-heat-temp = <600>;
+               maxim,over-volt = <4400>;
+
+               interrupt-parent = <&tlmm>;
+               interrupts = <121 IRQ_TYPE_EDGE_FALLING>;
+
+               pinctrl-0 = <&fuelgauge_int_default>;
+               pinctrl-names = "default";
+       };
+};
+
 &blsp_uart2 {
        status = "okay";
 };

diff --git a/arch/arm64/boot/dts/qcom/msm8916-thwc-uf896.dts b/arch/arm64/boot/dts/qcom/msm8916-thwc-uf896.dts
index 6fe1850..f349975 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-thwc-uf896.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-thwc-uf896.dts
@@ -13,16 +13,16 @@
        gpios = <&tlmm 35 GPIO_ACTIVE_LOW>;
 };
 
-&led_r {
-       gpios = <&tlmm 82 GPIO_ACTIVE_HIGH>;
+&led_b {
+       gpios = <&tlmm 81 GPIO_ACTIVE_HIGH>;
 };
 
 &led_g {
        gpios = <&tlmm 83 GPIO_ACTIVE_HIGH>;
 };
 
-&led_b {
-       gpios = <&tlmm 81 GPIO_ACTIVE_HIGH>;
+&led_r {
+       gpios = <&tlmm 82 GPIO_ACTIVE_HIGH>;
 };
 
 &button_default {

diff --git a/arch/arm64/boot/dts/qcom/msm8916-thwc-ufi001c.dts b/arch/arm64/boot/dts/qcom/msm8916-thwc-ufi001c.dts
index 16d4a91..6cb3911 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-thwc-ufi001c.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-thwc-ufi001c.dts
@@ -13,16 +13,16 @@
        gpios = <&tlmm 37 GPIO_ACTIVE_HIGH>;
 };
 
-&led_r {
-       gpios = <&tlmm 22 GPIO_ACTIVE_HIGH>;
+&led_b {
+       gpios = <&tlmm 20 GPIO_ACTIVE_HIGH>;
 };
 
 &led_g {
        gpios = <&tlmm 21 GPIO_ACTIVE_HIGH>;
 };
 
-&led_b {
-       gpios = <&tlmm 20 GPIO_ACTIVE_HIGH>;
+&led_r {
+       gpios = <&tlmm 22 GPIO_ACTIVE_HIGH>;
 };
 
 &mpss {

diff --git a/arch/arm64/boot/dts/qcom/msm8916-yiming-uz801v3.dts b/arch/arm64/boot/dts/qcom/msm8916-yiming-uz801v3.dts
index 5e6ba8c..a98efcf 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-yiming-uz801v3.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-yiming-uz801v3.dts
@@ -13,16 +13,16 @@
        gpios = <&tlmm 23 GPIO_ACTIVE_LOW>;
 };
 
-&led_r {
-       gpios = <&tlmm 7 GPIO_ACTIVE_HIGH>;
+&led_b {
+       gpios = <&tlmm 6 GPIO_ACTIVE_HIGH>;
 };
 
 &led_g {
        gpios = <&tlmm 8 GPIO_ACTIVE_HIGH>;
 };
 
-&led_b {
-       gpios = <&tlmm 6 GPIO_ACTIVE_HIGH>;
+&led_r {
+       gpios = <&tlmm 7 GPIO_ACTIVE_HIGH>;
 };
 
 &button_default {