Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 7932b1c9fdb73393aa110249c89bd426533c0649

Authored by Peng Fan
Committed by Stefano Babic
1 parent ebf4f0944d
Exists in smarc_8mq_lf_v2020.04 and in 9 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

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>

Showing 2 changed files with 6 additions and 3 deletions Side-by-side Diff

arch/arm/dts/imx6qdl-u-boot.dtsi
Diff comments   View file @ 7932b1c
... ... @@ -6,10 +6,12 @@
6 6 / {
7 7 aliases {
8 8 usb0 = &usbotg;
  9 + video0 = &ipu1;
9 10 };
10 11  
11 12 soc {
12 13 u-boot,dm-spl;
  14 + u-boot,dm-pre-reloc;
13 15  
14 16 aips-bus@2000000 {
15 17 u-boot,dm-spl;
... ... @@ -30,5 +32,9 @@
30 32  
31 33 &iomuxc {
32 34 u-boot,dm-spl;
  35 +};
  36 +
  37 +&ipu1 {
  38 + u-boot,dm-pre-reloc;
33 39 };
arch/arm/dts/imx6qdl.dtsi
Diff comments   View file @ 7932b1c
... ... @@ -33,7 +33,6 @@
33 33 i2c1 = &i2c2;
34 34 i2c2 = &i2c3;
35 35 ipu0 = &ipu1;
36   - video0 = &ipu1;
37 36 mmc0 = &usdhc1;
38 37 mmc1 = &usdhc2;
39 38 mmc2 = &usdhc3;
... ... @@ -146,7 +145,6 @@
146 145 compatible = "simple-bus";
147 146 interrupt-parent = <&gpc>;
148 147 ranges;
149   - u-boot,dm-pre-reloc;
150 148  
151 149 dma_apbh: dma-apbh@110000 {
152 150 compatible = "fsl,imx6q-dma-apbh", "fsl,imx28-dma-apbh";
... ... @@ -1263,7 +1261,6 @@
1263 1261 <&clks IMX6QDL_CLK_IPU1_DI1>;
1264 1262 clock-names = "bus", "di0", "di1";
1265 1263 resets = <&src 2>;
1266   - u-boot,dm-pre-reloc;
1267 1264  
1268 1265 ipu1_csi0: port@0 {
1269 1266 reg = <0>;