ARM: dts: iwg22d-sodimm: Fix dt nodes sorting

Some r8a7745-iwg22d-sodimm.dts device nodes are not sorted alphabetically.
This patch fixes the sorting of nodes and also fixes a typo in the stmpe
node.

Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Link: https://lore.kernel.org/r/20200805142634.12252-1-biju.das.jz@bp.renesas.com
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

diff --git a/arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts b/arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts
index b15b1b088a3239045515db3635a461f9b803be9a..1c7b37a01f0ab9239b761e0cb4ac38450a9b9faa 100644 (file)
--- a/arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts
+++ b/arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts
@@ -53,42 +53,6 @@
                clock-frequency = <26000000>;
        };
 
-       rsnd_sgtl5000: sound {
-               compatible = "simple-audio-card";
-               simple-audio-card,format = "i2s";
-               simple-audio-card,bitclock-master = <&sndcodec>;
-               simple-audio-card,frame-master = <&sndcodec>;
-
-               sndcpu: simple-audio-card,cpu {
-                       sound-dai = <&rcar_sound>;
-               };
-
-               sndcodec: simple-audio-card,codec {
-                       sound-dai = <&sgtl5000>;
-               };
-       };
-
-       vccq_sdhi0: regulator-vccq-sdhi0 {
-               compatible = "regulator-gpio";
-
-               regulator-name = "SDHI0 VccQ";
-               regulator-min-microvolt = <1800000>;
-               regulator-max-microvolt = <3300000>;
-
-               gpios = <&gpio0 20 GPIO_ACTIVE_LOW>;
-               gpios-states = <1>;
-               states = <3300000 1>, <1800000 0>;
-       };
-
-       vccq_panel: regulator-vccq-panel {
-               compatible = "regulator-fixed";
-               regulator-name = "Panel VccQ";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-               gpio = <&gpio1 13 GPIO_ACTIVE_LOW>;
-               enable-active-high;
-       };
-
        backlight_lcd: backlight {
                compatible = "pwm-backlight";
                pwms = <&tpu 3 5000000 PWM_POLARITY_INVERTED>;
@@ -107,19 +71,40 @@
                        };
                };
        };
-};
 
-&du {
-       pinctrl-0 = <&du0_pins>;
-       pinctrl-names = "default";
+       vccq_panel: regulator-vccq-panel {
+               compatible = "regulator-fixed";
+               regulator-name = "Panel VccQ";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               gpio = <&gpio1 13 GPIO_ACTIVE_LOW>;
+               enable-active-high;
+       };
 
-       status = "okay";
+       vccq_sdhi0: regulator-vccq-sdhi0 {
+               compatible = "regulator-gpio";
 
-       ports {
-               port@0 {
-                       endpoint {
-                               remote-endpoint = <&lcd_in>;
-                       };
+               regulator-name = "SDHI0 VccQ";
+               regulator-min-microvolt = <1800000>;
+               regulator-max-microvolt = <3300000>;
+
+               gpios = <&gpio0 20 GPIO_ACTIVE_LOW>;
+               gpios-states = <1>;
+               states = <3300000 1>, <1800000 0>;
+       };
+
+       rsnd_sgtl5000: sound {
+               compatible = "simple-audio-card";
+               simple-audio-card,format = "i2s";
+               simple-audio-card,bitclock-master = <&sndcodec>;
+               simple-audio-card,frame-master = <&sndcodec>;
+
+               sndcpu: simple-audio-card,cpu {
+                       sound-dai = <&rcar_sound>;
+               };
+
+               sndcodec: simple-audio-card,codec {
+                       sound-dai = <&sgtl5000>;
                };
        };
 };
@@ -150,6 +135,21 @@
        status = "okay";
 };
 
+&du {
+       pinctrl-0 = <&du0_pins>;
+       pinctrl-names = "default";
+
+       status = "okay";
+
+       ports {
+               port@0 {
+                       endpoint {
+                               remote-endpoint = <&lcd_in>;
+                       };
+               };
+       };
+};
+
 &hscif1 {
        pinctrl-0 = <&hscif1_pins>;
        pinctrl-names = "default";
@@ -171,6 +171,15 @@
        status = "okay";
        clock-frequency = <400000>;
 
+       sgtl5000: codec@a {
+               compatible = "fsl,sgtl5000";
+               #sound-dai-cells = <0>;
+               reg = <0x0a>;
+               clocks = <&audio_clock>;
+               VDDA-supply = <&reg_3p3v>;
+               VDDIO-supply = <&reg_3p3v>;
+       };
+
        stmpe811@44 {
                compatible = "st,stmpe811";
                reg = <0x44>;
@@ -179,7 +188,7 @@
 
                /* 3.25 MHz ADC clock speed */
                st,adc-freq = <1>;
-               /* ADC converstion time: 80 clocks */
+               /* ADC conversion time: 80 clocks */
                st,sample-time = <4>;
                /* 12-bit ADC */
                st,mod-12b = <1>;
@@ -203,15 +212,6 @@
                        st,touch-det-delay = <5>;
                };
        };
-
-       sgtl5000: codec@a {
-               compatible = "fsl,sgtl5000";
-               #sound-dai-cells = <0>;
-               reg = <0x0a>;
-               clocks = <&audio_clock>;
-               VDDA-supply = <&reg_3p3v>;
-               VDDIO-supply = <&reg_3p3v>;
-       };
 };
 
 &pci1 {