[src/netbsd-7]: src/sys/arch/arm/broadcom Pull up following revision(s) (requ...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5003da44c83a
branches:  netbsd-7
changeset: 798722:5003da44c83a
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Dec 17 18:47:34 2014 +0000

description:
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@

diffstat:

 sys/arch/arm/broadcom/bcm2835_tmr.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r c457709927ea -r 5003da44c83a sys/arch/arm/broadcom/bcm2835_tmr.c
--- a/sys/arch/arm/broadcom/bcm2835_tmr.c       Wed Dec 17 18:43:47 2014 +0000
+++ b/sys/arch/arm/broadcom/bcm2835_tmr.c       Wed Dec 17 18:47:34 2014 +0000
@@ -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 @@
        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);