projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.denx.de/u-boot
[oweals/u-boot.git]
/
arch
/
arm
/
dts
/
imx6qdl-u-boot.dtsi
diff --git
a/arch/arm/dts/imx6qdl-u-boot.dtsi
b/arch/arm/dts/imx6qdl-u-boot.dtsi
index 0aa29e38b831deb48db8990bc00929dbd3877a39..1279cc2338b6fe8b1feb4872775f14f846169b40 100644
(file)
--- a/
arch/arm/dts/imx6qdl-u-boot.dtsi
+++ b/
arch/arm/dts/imx6qdl-u-boot.dtsi
@@
-4,8
+4,14
@@
*/
/ {
+ aliases {
+ usb0 = &usbotg;
+ video0 = &ipu1;
+ };
+
soc {
u-boot,dm-spl;
+ u-boot,dm-pre-reloc;
aips-bus@2000000 {
u-boot,dm-spl;
@@
-27,3
+33,7
@@
&iomuxc {
u-boot,dm-spl;
};
+
+&ipu1 {
+ u-boot,dm-pre-reloc;
+};