imx: imx6qdl: dtsi: move U-Boot specific change to u-boot.dtsi

The changes were added by following patch:
commit <9002e735e717> ("imx: mx6sabresd: fix boot hang with video")
commit <f45ec8fcfb86> ("imx6: dts: add 'u-boot, dm-pre-reloc' to soc and ipu nodes")

Let's move the U-Boot specific change to imx6qdl-u-boot.dtsi

Signed-off-by: Peng Fan <peng.fan@nxp.com>

diff --git a/arch/arm/dts/imx6qdl-u-boot.dtsi b/arch/arm/dts/imx6qdl-u-boot.dtsi
index e161ebb9af45221d621f4cf31aa1d3704d501f3f..1279cc2338b6fe8b1feb4872775f14f846169b40 100644 (file)
--- a/arch/arm/dts/imx6qdl-u-boot.dtsi
+++ b/arch/arm/dts/imx6qdl-u-boot.dtsi
@@ -6,10 +6,12 @@
 / {
        aliases {
                usb0 = &usbotg;
+               video0 = &ipu1;
        };
 
        soc {
                u-boot,dm-spl;
+               u-boot,dm-pre-reloc;
 
                aips-bus@2000000 {
                        u-boot,dm-spl;
@@ -31,3 +33,7 @@
 &iomuxc {
        u-boot,dm-spl;
 };
+
+&ipu1 {
+       u-boot,dm-pre-reloc;
+};

diff --git a/arch/arm/dts/imx6qdl.dtsi b/arch/arm/dts/imx6qdl.dtsi
index 83eeb5cc591fdc2f6951825ce4d52b706b37d793..e4daf150881a9e2c9f5d5283e470edd8c586b13a 100644 (file)
--- a/arch/arm/dts/imx6qdl.dtsi
+++ b/arch/arm/dts/imx6qdl.dtsi
@@ -33,7 +33,6 @@
                i2c1 = &i2c2;
                i2c2 = &i2c3;
                ipu0 = &ipu1;
-               video0 = &ipu1;
                mmc0 = &usdhc1;
                mmc1 = &usdhc2;
                mmc2 = &usdhc3;
@@ -146,7 +145,6 @@
                compatible = "simple-bus";
                interrupt-parent = <&gpc>;
                ranges;
-               u-boot,dm-pre-reloc;
 
                dma_apbh: dma-apbh@110000 {
                        compatible = "fsl,imx6q-dma-apbh", "fsl,imx28-dma-apbh";
@@ -1263,7 +1261,6 @@
                                 <&clks IMX6QDL_CLK_IPU1_DI1>;
                        clock-names = "bus", "di0", "di1";
                        resets = <&src 2>;
-                       u-boot,dm-pre-reloc;
 
                        ipu1_csi0: port@0 {
                                reg = <0>;