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 branch 'for-4.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
[sfrench/cifs-2.6.git]
/
arch
/
arm64
/
boot
/
dts
/
amlogic
/
meson-gxl-s905x-nexbox-a95x.dts
diff --git
a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts
b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts
index 6633a5d8fdd39193be747582e8facc8a581a9486..4c2ac7650fcd3317a673efdd7308891a154272d8 100644
(file)
--- a/
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts
+++ b/
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts
@@
-140,6
+140,13
@@
};
};
+&cec_AO {
+ status = "okay";
+ pinctrl-0 = <&ao_cec_pins>;
+ pinctrl-names = "default";
+ hdmi-phandle = <&hdmi_tx>;
+};
+
&cvbs_vdac_port {
cvbs_vdac_out: endpoint {
remote-endpoint = <&cvbs_connector_in>;