Module Name: src
Committed By: martin
Date: Wed Oct 18 11:49:09 UTC 2023
Modified Files:
src/sys/arch/arm/ti [netbsd-10]: ti_com.c
Log Message:
Pull up following revision(s) (requested by gutteridge in ticket #419):
sys/arch/arm/ti/ti_com.c: revision 1.12
ti_com.c: set sc_type to COM_TYPE_OMAP
Avoid a kernel hang reported by Brook Milligan in PR port-arm/57598.
Patch suggested by RVP, seems correct to several of us. (If this
introduces a regression with some board, sorry, mea culpa. But in
that case we should still be carrying this, just conditionalized.)
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.11.18.1 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/ti_com.c
diff -u src/sys/arch/arm/ti/ti_com.c:1.11 src/sys/arch/arm/ti/ti_com.c:1.11.18.1
--- src/sys/arch/arm/ti/ti_com.c:1.11 Wed Jan 27 03:10:20 2021
+++ src/sys/arch/arm/ti/ti_com.c Wed Oct 18 11:49:09 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ti_com.c,v 1.11 2021/01/27 03:10:20 thorpej Exp $ */
+/* $NetBSD: ti_com.c,v 1.11.18.1 2023/10/18 11:49:09 martin Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: ti_com.c,v 1.11 2021/01/27 03:10:20 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: ti_com.c,v 1.11.18.1 2023/10/18 11:49:09 martin Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -95,7 +95,7 @@ ti_com_attach(device_t parent, device_t
return;
}
- sc->sc_type = COM_TYPE_NORMAL;
+ sc->sc_type = COM_TYPE_OMAP;
error = bus_space_map(bst, addr, size, 0, &bsh);
if (error) {
