Module Name: src
Committed By: jmcneill
Date: Sat Aug 1 21:20:47 UTC 2015
Modified Files:
src/sys/arch/evbarm/conf: JETSONTK1
src/sys/arch/evbarm/tegra: tegra_machdep.c
Log Message:
Enable tegracec and hdmicec
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/evbarm/conf/JETSONTK1
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbarm/tegra/tegra_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/conf/JETSONTK1
diff -u src/sys/arch/evbarm/conf/JETSONTK1:1.29 src/sys/arch/evbarm/conf/JETSONTK1:1.30
--- src/sys/arch/evbarm/conf/JETSONTK1:1.29 Sun Jul 26 10:09:53 2015
+++ src/sys/arch/evbarm/conf/JETSONTK1 Sat Aug 1 21:20:46 2015
@@ -1,5 +1,5 @@
#
-# $NetBSD: JETSONTK1,v 1.29 2015/07/26 10:09:53 jmcneill Exp $
+# $NetBSD: JETSONTK1,v 1.30 2015/08/01 21:20:46 jmcneill Exp $
#
# NVIDIA Jetson TK1 - Tegra K1 development kit
# https://developer.nvidia.com/jetson-tk1
@@ -146,6 +146,8 @@ pseudo-device wsfont
# HDMI
tegrahdmi0 at tegraio? # HDMI
+tegracec0 at tegraio? # HDMI CEC
+hdmicec* at hdmicecbus?
# USB 2.0
ehci0 at tegraio? port 0 # USB1
Index: src/sys/arch/evbarm/tegra/tegra_machdep.c
diff -u src/sys/arch/evbarm/tegra/tegra_machdep.c:1.17 src/sys/arch/evbarm/tegra/tegra_machdep.c:1.18
--- src/sys/arch/evbarm/tegra/tegra_machdep.c:1.17 Sat May 30 23:17:37 2015
+++ src/sys/arch/evbarm/tegra/tegra_machdep.c Sat Aug 1 21:20:47 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_machdep.c,v 1.17 2015/05/30 23:17:37 matt Exp $ */
+/* $NetBSD: tegra_machdep.c,v 1.18 2015/08/01 21:20:47 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_machdep.c,v 1.17 2015/05/30 23:17:37 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_machdep.c,v 1.18 2015/08/01 21:20:47 jmcneill Exp $");
#include "opt_tegra.h"
#include "opt_machdep.h"
@@ -395,6 +395,10 @@ tegra_device_register(device_t self, voi
#endif
}
+ if (device_is_a(self, "tegracec")) {
+ prop_dictionary_set_cstring(dict, "hdmi-device", "tegrahdmi0");
+ }
+
#ifdef BOARD_JETSONTK1
if (device_is_a(self, "sdhc")
&& device_is_a(device_parent(self), "tegraio")) {
