[src/netbsd-6-0]: src/sys/arch/arm/broadcom Pull up following revision(s) (re...

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

details:   https://anonhg.NetBSD.org/src/rev/4cc2e85bd9a3
branches:  netbsd-6-0
changeset: 775028:4cc2e85bd9a3
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Sun Dec 21 20:21:28 2014 +0000

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

diffstat:

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

diffs (27 lines):

diff -r e6a91c062e8a -r 4cc2e85bd9a3 sys/arch/arm/broadcom/bcm2835_tmr.c
--- a/sys/arch/arm/broadcom/bcm2835_tmr.c       Sun Dec 21 19:05:57 2014 +0000
+++ b/sys/arch/arm/broadcom/bcm2835_tmr.c       Sun Dec 21 20:21:28 2014 +0000
@@ -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 @@
        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);