ARM: dts: imx53-tx53: Move 'display' node out of 'soc' node

Move the display node out of the soc node. This aligns the DT with
other boards; no functional change.

diff --git a/arch/arm/boot/dts/imx53-tx53-x03x.dts b/arch/arm/boot/dts/imx53-tx53-x03x.dts
index 3b73e81dc3f0df58507a7a6a3ae0556f9abee7dd..f95fde2ac0193c5c314a5ad4e42a57256459aee3 100644 (file)
--- a/arch/arm/boot/dts/imx53-tx53-x03x.dts
+++ b/arch/arm/boot/dts/imx53-tx53-x03x.dts
@@ -22,132 +22,130 @@
                display = &display;
        };
 
-       soc {
-               display: display@di0 {
-                       compatible = "fsl,imx-parallel-display";
-                       interface-pix-fmt = "rgb24";
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&pinctrl_rgb24_vga1>;
-                       status = "okay";
+       display: display@di0 {
+               compatible = "fsl,imx-parallel-display";
+               interface-pix-fmt = "rgb24";
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_rgb24_vga1>;
+               status = "okay";
 
-                       port {
-                               display0_in: endpoint {
-                                       remote-endpoint = <&ipu_di0_disp0>;
-                               };
+               port {
+                       display0_in: endpoint {
+                               remote-endpoint = <&ipu_di0_disp0>;
                        };
+               };
 
-                       display-timings {
-                               VGA {
-                                       clock-frequency = <25200000>;
-                                       hactive = <640>;
-                                       vactive = <480>;
-                                       hback-porch = <48>;
-                                       hsync-len = <96>;
-                                       hfront-porch = <16>;
-                                       vback-porch = <31>;
-                                       vsync-len = <2>;
-                                       vfront-porch = <12>;
-                                       hsync-active = <0>;
-                                       vsync-active = <0>;
-                                       de-active = <1>;
-                                       pixelclk-active = <0>;
-                               };
+               display-timings {
+                       VGA {
+                               clock-frequency = <25200000>;
+                               hactive = <640>;
+                               vactive = <480>;
+                               hback-porch = <48>;
+                               hsync-len = <96>;
+                               hfront-porch = <16>;
+                               vback-porch = <31>;
+                               vsync-len = <2>;
+                               vfront-porch = <12>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <0>;
+                       };
 
-                               ETV570 {
-                                       clock-frequency = <25200000>;
-                                       hactive = <640>;
-                                       vactive = <480>;
-                                       hback-porch = <114>;
-                                       hsync-len = <30>;
-                                       hfront-porch = <16>;
-                                       vback-porch = <32>;
-                                       vsync-len = <3>;
-                                       vfront-porch = <10>;
-                                       hsync-active = <0>;
-                                       vsync-active = <0>;
-                                       de-active = <1>;
-                                       pixelclk-active = <0>;
-                               };
+                       ETV570 {
+                               clock-frequency = <25200000>;
+                               hactive = <640>;
+                               vactive = <480>;
+                               hback-porch = <114>;
+                               hsync-len = <30>;
+                               hfront-porch = <16>;
+                               vback-porch = <32>;
+                               vsync-len = <3>;
+                               vfront-porch = <10>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <0>;
+                       };
 
-                               ET0350 {
-                                       clock-frequency = <6413760>;
-                                       hactive = <320>;
-                                       vactive = <240>;
-                                       hback-porch = <34>;
-                                       hsync-len = <34>;
-                                       hfront-porch = <20>;
-                                       vback-porch = <15>;
-                                       vsync-len = <3>;
-                                       vfront-porch = <4>;
-                                       hsync-active = <0>;
-                                       vsync-active = <0>;
-                                       de-active = <1>;
-                                       pixelclk-active = <0>;
-                               };
+                       ET0350 {
+                               clock-frequency = <6413760>;
+                               hactive = <320>;
+                               vactive = <240>;
+                               hback-porch = <34>;
+                               hsync-len = <34>;
+                               hfront-porch = <20>;
+                               vback-porch = <15>;
+                               vsync-len = <3>;
+                               vfront-porch = <4>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <0>;
+                       };
 
-                               ET0430 {
-                                       clock-frequency = <9009000>;
-                                       hactive = <480>;
-                                       vactive = <272>;
-                                       hback-porch = <2>;
-                                       hsync-len = <41>;
-                                       hfront-porch = <2>;
-                                       vback-porch = <2>;
-                                       vsync-len = <10>;
-                                       vfront-porch = <2>;
-                                       hsync-active = <0>;
-                                       vsync-active = <0>;
-                                       de-active = <1>;
-                                       pixelclk-active = <1>;
-                               };
+                       ET0430 {
+                               clock-frequency = <9009000>;
+                               hactive = <480>;
+                               vactive = <272>;
+                               hback-porch = <2>;
+                               hsync-len = <41>;
+                               hfront-porch = <2>;
+                               vback-porch = <2>;
+                               vsync-len = <10>;
+                               vfront-porch = <2>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <1>;
+                       };
 
-                               ET0500 {
-                                       clock-frequency = <33264000>;
-                                       hactive = <800>;
-                                       vactive = <480>;
-                                       hback-porch = <88>;
-                                       hsync-len = <128>;
-                                       hfront-porch = <40>;
-                                       vback-porch = <33>;
-                                       vsync-len = <2>;
-                                       vfront-porch = <10>;
-                                       hsync-active = <0>;
-                                       vsync-active = <0>;
-                                       de-active = <1>;
-                                       pixelclk-active = <0>;
-                               };
+                       ET0500 {
+                               clock-frequency = <33264000>;
+                               hactive = <800>;
+                               vactive = <480>;
+                               hback-porch = <88>;
+                               hsync-len = <128>;
+                               hfront-porch = <40>;
+                               vback-porch = <33>;
+                               vsync-len = <2>;
+                               vfront-porch = <10>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <0>;
+                       };
 
-                               ET0700 { /* same as ET0500 */
-                                       clock-frequency = <33264000>;
-                                       hactive = <800>;
-                                       vactive = <480>;
-                                       hback-porch = <88>;
-                                       hsync-len = <128>;
-                                       hfront-porch = <40>;
-                                       vback-porch = <33>;
-                                       vsync-len = <2>;
-                                       vfront-porch = <10>;
-                                       hsync-active = <0>;
-                                       vsync-active = <0>;
-                                       de-active = <1>;
-                                       pixelclk-active = <0>;
-                               };
+                       ET0700 { /* same as ET0500 */
+                               clock-frequency = <33264000>;
+                               hactive = <800>;
+                               vactive = <480>;
+                               hback-porch = <88>;
+                               hsync-len = <128>;
+                               hfront-porch = <40>;
+                               vback-porch = <33>;
+                               vsync-len = <2>;
+                               vfront-porch = <10>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <0>;
+                       };
 
-                               ETQ570 {
-                                       clock-frequency = <6596040>;
-                                       hactive = <320>;
-                                       vactive = <240>;
-                                       hback-porch = <38>;
-                                       hsync-len = <30>;
-                                       hfront-porch = <30>;
-                                       vback-porch = <16>;
-                                       vsync-len = <3>;
-                                       vfront-porch = <4>;
-                                       hsync-active = <0>;
-                                       vsync-active = <0>;
-                                       de-active = <1>;
-                                       pixelclk-active = <0>;
-                               };
+                       ETQ570 {
+                               clock-frequency = <6596040>;
+                               hactive = <320>;
+                               vactive = <240>;
+                               hback-porch = <38>;
+                               hsync-len = <30>;
+                               hfront-porch = <30>;
+                               vback-porch = <16>;
+                               vsync-len = <3>;
+                               vfront-porch = <4>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <0>;
                        };
                };
        };