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 'v3.15' into next
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
imx53-mba53.dts
diff --git
a/arch/arm/boot/dts/imx53-mba53.dts
b/arch/arm/boot/dts/imx53-mba53.dts
index 7c8c129698929151512f282c5baad14c69f51309..a3431d7848709aac0463a27e4471c22dd17a4a46 100644
(file)
--- a/
arch/arm/boot/dts/imx53-mba53.dts
+++ b/
arch/arm/boot/dts/imx53-mba53.dts
@@
-244,7
+244,7
@@
&tve {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_vga_sync_1>;
-
i2c-dd
c-bus = <&i2c3>;
+
ddc-i2
c-bus = <&i2c3>;
fsl,tve-mode = "vga";
fsl,hsync-pin = <4>;
fsl,vsync-pin = <6>;