Module Name: src Committed By: msaitoh Date: Sun Dec 21 20:21:28 UTC 2014
Modified Files: src/sys/arch/arm/broadcom [netbsd-6-0]: bcm2835_tmr.c Log Message: Pull up following revision(s) (requested by nat in ticket #1214): 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.1.2.2 -r1.1.2.2.4.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.1.2.2 src/sys/arch/arm/broadcom/bcm2835_tmr.c:1.1.2.2.4.1 --- src/sys/arch/arm/broadcom/bcm2835_tmr.c:1.1.2.2 Thu Aug 9 06:36:50 2012 +++ src/sys/arch/arm/broadcom/bcm2835_tmr.c Sun Dec 21 20:21:28 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: bcm2835_tmr.c,v 1.1.2.2 2012/08/09 06:36:50 jdc Exp $ */ +/* $NetBSD: bcm2835_tmr.c,v 1.1.2.2.4.1 2014/12/21 20:21:28 msaitoh 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.1.2.2 2012/08/09 06:36:50 jdc Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bcm2835_tmr.c,v 1.1.2.2.4.1 2014/12/21 20:21:28 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -204,7 +204,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);