leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Peng Fan 2019-08-14 09:27:06 +00:00 committed by Stefano Babic
parent ebf4f0944d
commit 7932b1c9fd
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/dts/imx6qdl-u-boot.dtsi
View File

@ -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;
};

3
arch/arm/dts/imx6qdl.dtsi
View File

@ -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>;