git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'rtc-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
imx6dl-aristainetos_4.dts
diff --git
a/arch/arm/boot/dts/imx6dl-aristainetos_4.dts
b/arch/arm/boot/dts/imx6dl-aristainetos_4.dts
index 32a812b1839ea0cc5e3ab4451b031e6053fb9b29..cc418cecabdb3b76ef5be767184950b5d609d64f 100644
(file)
--- a/
arch/arm/boot/dts/imx6dl-aristainetos_4.dts
+++ b/
arch/arm/boot/dts/imx6dl-aristainetos_4.dts
@@
-32,7
+32,7
@@
};
soc {
- display0: disp
lay@di
0 {
+ display0: disp0 {
compatible = "fsl,imx-parallel-display";
interface-pix-fmt = "rgb24";
pinctrl-names = "default";