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
/
imx6ul-opos6uldev-u-boot.dtsi
diff --git
a/arch/arm/dts/imx6ul-opos6uldev-u-boot.dtsi
b/arch/arm/dts/imx6ul-opos6uldev-u-boot.dtsi
index da8b0392ef619a7e4c960f517860fc81212f8fb7..3f351ef0c425dfc36bf1e857ac7d1bebdc5f6b4c 100644
(file)
--- a/
arch/arm/dts/imx6ul-opos6uldev-u-boot.dtsi
+++ b/
arch/arm/dts/imx6ul-opos6uldev-u-boot.dtsi
@@
-7,6
+7,12
@@
#include "imx6ul-opos6ul-u-boot.dtsi"
+/ {
+ aliases {
+ display0 = &lcdif;
+ };
+};
+
&aips1 {
u-boot,dm-spl;
@@
-15,6
+21,10
@@
};
};
+&lcdif {
+ u-boot,dm-pre-proper;
+};
+
&pinctrl_uart1 {
u-boot,dm-spl;
};