Module Name: src
Committed By: martin
Date: Wed Dec 17 18:47:34 UTC 2014
Modified Files:
src/sys/arch/arm/broadcom [netbsd-7]: bcm2835_tmr.c
Log Message:
Pull up following revision(s) (requested by nat in ticket #333):
sys/arch/arm/broadcom/bcm2835_tmr.c: revision 1.4
Clear status of BCM2835_STIMER_M3 only as timer comparison reg 0 and 2
are used by the VideoCore on Raspberry Pi. This fixes audio playback.
Addresses PR 48805.
This commit was approved by skrll@
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.12.1 src/sys/arch/arm/broadcom/bcm2835_tmr.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/broadcom/bcm2835_tmr.c
diff -u src/sys/arch/arm/broadcom/bcm2835_tmr.c:1.3 src/sys/arch/arm/broadcom/bcm2835_tmr.c:1.3.12.1
--- src/sys/arch/arm/broadcom/bcm2835_tmr.c:1.3 Tue Jan 8 12:13:58 2013
+++ src/sys/arch/arm/broadcom/bcm2835_tmr.c Wed Dec 17 18:47:34 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_tmr.c,v 1.3 2013/01/08 12:13:58 skrll Exp $ */
+/* $NetBSD: bcm2835_tmr.c,v 1.3.12.1 2014/12/17 18:47:34 martin Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_tmr.c,v 1.3 2013/01/08 12:13:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_tmr.c,v 1.3.12.1 2014/12/17 18:47:34 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -201,7 +201,7 @@ clockhandler(void *arg)
if (!(status & BCM2835_STIMER_M3))
return 0;
- bus_space_write_4(sc->sc_iot, sc->sc_ioh, BCM2835_STIMER_CS, status);
+ bus_space_write_4(sc->sc_iot, sc->sc_ioh, BCM2835_STIMER_CS, BCM2835_STIMER_M3);
hardclock(frame);
