Module Name: src
Committed By: jmcneill
Date: Sun Oct 27 11:33:56 UTC 2019
Modified Files:
src/sys/arch/arm/ti: files.ti ti_com.c
Log Message:
Make com work again
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/ti/files.ti
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/ti/ti_com.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/arm/ti/files.ti
diff -u src/sys/arch/arm/ti/files.ti:1.6 src/sys/arch/arm/ti/files.ti:1.7
--- src/sys/arch/arm/ti/files.ti:1.6 Sat Oct 26 15:58:55 2019
+++ src/sys/arch/arm/ti/files.ti Sun Oct 27 11:33:56 2019
@@ -1,4 +1,4 @@
-# $NetBSD: files.ti,v 1.6 2019/10/26 15:58:55 jmcneill Exp $
+# $NetBSD: files.ti,v 1.7 2019/10/27 11:33:56 jmcneill Exp $
#
file arch/arm/ti/ti_platform.c soc_ti
@@ -23,10 +23,8 @@ attach am3prcm at fdt with am3_prcm
file arch/arm/ti/am3_prcm.c am3_prcm
# UART
-ifdef soc_ti
attach com at fdt with ti_com: ti_prcm
file arch/arm/ti/ti_com.c ti_com needs-flag
-endif
# Timer
device omaptimer
Index: src/sys/arch/arm/ti/ti_com.c
diff -u src/sys/arch/arm/ti/ti_com.c:1.5 src/sys/arch/arm/ti/ti_com.c:1.6
--- src/sys/arch/arm/ti/ti_com.c:1.5 Fri Oct 18 06:58:06 2019
+++ src/sys/arch/arm/ti/ti_com.c Sun Oct 27 11:33:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ti_com.c,v 1.5 2019/10/18 06:58:06 skrll Exp $ */
+/* $NetBSD: ti_com.c,v 1.6 2019/10/27 11:33:56 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: ti_com.c,v 1.5 2019/10/18 06:58:06 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: ti_com.c,v 1.6 2019/10/27 11:33:56 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -106,7 +106,7 @@ ti_com_attach(device_t parent, device_t
return;
}
- hwmod = ti_prcm_get_hwmod(phandle, 0);
+ hwmod = ti_prcm_get_hwmod(OF_parent(phandle), 0);
KASSERT(hwmod != NULL);
if (clk_enable(hwmod) != 0) {
aprint_error(": couldn't enable module\n");
