 @@ -1,14 +1,14 @@
-/*	$NetBSD: pwmclock.c,v 1.1 2011/12/13 14:39:37 macallan Exp $	*/
+/*	$NetBSD: pwmclock.c,v 1.2 2011/12/13 14:46:07 macallan Exp $	*/
 /*
  * Copyright (c) 2011 Michael Lorenz
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -16,44 +16,46 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pwmclock.c,v 1.1 2011/12/13 14:39:37 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pwmclock.c,v 1.2 2011/12/13 14:46:07 macallan Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/cpu.h>
 #include <sys/timetc.h>
 #include <sys/sysctl.h>
 #include <dev/pci/voyagervar.h>
 #include <dev/ic/sm502reg.h>
 #include <mips/mips3_clock.h>
 #include <mips/locore.h>
 #include <mips/bonito/bonitoreg.h>
 #include <mips/bonito/bonitovar.h>
 #include "opt_pwmclock.h"
 #ifdef PWMCLOCK_DEBUG
 #define DPRINTF aprint_error
 #else
 #define DPRINTF while (0) printf
 #endif
 int pwmclock_intr(void *);
 struct pwmclock_softc {
 	device_t sc_dev;
 	bus_space_tag_t sc_memt;
 	bus_space_handle_t sc_regh;
 	uint32_t sc_reg, sc_last;
 @@ -129,43 +131,45 @@ pwmclock_attach(device_t parent, device_
 	sc->sc_memt = vaa->vaa_tag;
 	sc->sc_regh = vaa->vaa_regh;
 	aprint_normal("\n");
 	voyager_establish_intr(parent, 22, pwmclock_intr, sc);
 	reg = voyager_set_pwm(100, 100); /* 100Hz, 10% duty cycle */
 	reg |= SM502_PWM_ENABLE | SM502_PWM_ENABLE_INTR | SM502_PWM_INTR_PENDING;
 	sc->sc_reg = reg;
 	pwmclock = sc;
 	initclocks_ptr = pwmclock_start;
 	/* ok, let's see how far the cycle counter gets between interrupts */
-	aprint_normal_dev(sc->sc_dev, "calibrating CPU timer...\n");
+	DPRINTF("calibrating CPU timer...\n");
 	for (clk = 1; clk < 8; clk++) {
 		REGVAL(LS2F_CHIPCFG0) = (REGVAL(LS2F_CHIPCFG0) & ~LS2FCFG_FREQSCALE_MASK) | clk;
 		bus_space_write_4(sc->sc_memt, sc->sc_regh, SM502_PWM1, sc->sc_reg);
 		acc = 0;
 		last = pwmclock_wait_edge(sc);
 		for (i = 0; i < 16; i++) {
 			curr = pwmclock_wait_edge(sc);
 			diff = curr - last;
 			acc += diff;
 			last = curr;
+		}
 		sc->sc_scale[clk] = (acc >> 4) / 5000;
+	}
 #ifdef PWMCLOCK_DEBUG
 	for (clk = 1; clk < 8; clk++) {
 		aprint_normal_dev(sc->sc_dev, "%d/8: %d\n", clk + 1, sc->sc_scale[clk]);
+	}
 #endif
 	sc->sc_step = 7;
 	sc->sc_step_wanted = 7;
 	/* now setup sysctl */
 	if (sysctl_createv(NULL, 0, NULL,
 	    &me,
 	    CTLFLAG_READWRITE, CTLTYPE_NODE, "loongson", NULL, NULL,
 , NULL, 0, CTL_MACHDEP, CTL_CREATE, CTL_EOL) != 0)
 		aprint_error_dev(sc->sc_dev, "couldn't create 'loongson' node\n");
 	if (sysctl_createv(NULL, 0, NULL,
 	    &freq,
 	    CTLFLAG_READWRITE, CTLTYPE_NODE, "frequency", NULL, NULL,

 @@ -1,19 +1,20 @@
 # Silicon Motion SM502 / Voyager GX
 define voyagerbus {}
 # the graphics part
 device	voyagerfb: wsemuldisplaydev, rasops8, rasops16, vcons, videomode, iic, i2c_bitbang
 attach	voyagerfb at voyagerbus
 file	dev/pci/voyager/voyagerfb.c		voyagerfb needs-flag
 defflag	opt_voyagerfb.h	VOYAGERFB_DEBUG
 # a clock timer
 defflag opt_pwmclock.h PWMCLOCK_DEBUG
 device 	pwmclock
 attach 	pwmclock at voyagerbus
 file	dev/pci/voyager/pwmclock.c		pwmclock needs-flag
 # the audio part
 device 	vac: audiobus, auconv, mulaw
 attach 	vac at voyagerbus
 file 	dev/pci/voyager/vac.c			vac needs-flag