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 commit '949bdcc8a97c' into omap-for-v4.19/dt
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
imx6ul-tx6ul-mainboard.dts
diff --git
a/arch/arm/boot/dts/imx6ul-tx6ul-mainboard.dts
b/arch/arm/boot/dts/imx6ul-tx6ul-mainboard.dts
index 2d80f7b50bc03bce0ddc66d855ac4f8199644353..97686097a86ec50d51f8ac2ebc85f9eaeed7df89 100644
(file)
--- a/
arch/arm/boot/dts/imx6ul-tx6ul-mainboard.dts
+++ b/
arch/arm/boot/dts/imx6ul-tx6ul-mainboard.dts
@@
-48,7
+48,7
@@
compatible = "karo,imx6ul-tx6ul", "fsl,imx6ul";
aliases {
- lcdif
_24bit_pins_
a = &pinctrl_disp0_3;
+ lcdif
-24bit-pins-
a = &pinctrl_disp0_3;
mmc0 = &usdhc1;
/delete-property/ mmc1;
serial2 = &uart3;