Module Name: src Committed By: martin Date: Sat Nov 16 16:35:00 UTC 2019
Modified Files: src/sys/arch/arm/sa11x0 [netbsd-8]: sa11x0_ost.c Log Message: Pull up following revision(s) (requested by tsutsui in ticket #1445): sys/arch/arm/sa11x0/sa11x0_ost.c: revision 1.33 Fix another attach failure of zaudio(4) WM8731 on Zaurus SL-C7x0/860. When kernels were configured for both CPU_XSCALE_PXA270 and CPU_XSCALE_PXA250, the OST freq value was not set until tc_init(9) then all delay(9) during configure(9) returned immediately. While here, use proper macro with description for readability. Should be pulled up to netbsd-8 and netbsd-9. (though zaudio(4) won't work on netbsd-8) To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.32.8.1 src/sys/arch/arm/sa11x0/sa11x0_ost.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/sa11x0/sa11x0_ost.c diff -u src/sys/arch/arm/sa11x0/sa11x0_ost.c:1.32 src/sys/arch/arm/sa11x0/sa11x0_ost.c:1.32.8.1 --- src/sys/arch/arm/sa11x0/sa11x0_ost.c:1.32 Sun Oct 9 14:43:17 2016 +++ src/sys/arch/arm/sa11x0/sa11x0_ost.c Sat Nov 16 16:35:00 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: sa11x0_ost.c,v 1.32 2016/10/09 14:43:17 christos Exp $ */ +/* $NetBSD: sa11x0_ost.c,v 1.32.8.1 2019/11/16 16:35:00 martin Exp $ */ /* * Copyright (c) 1997 Mark Brinicombe. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sa11x0_ost.c,v 1.32 2016/10/09 14:43:17 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sa11x0_ost.c,v 1.32.8.1 2019/11/16 16:35:00 martin Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -80,14 +80,23 @@ struct saost_softc { static struct saost_softc *saost_sc = NULL; +#define PXA270_OST_FREQ 3250000 /* PXA270 uses 3.25MHz */ +#define SAOST_FREQ 3686400 /* Others use 3.6864MHz */ +#define SAOST_MAXFREQ SAOST_FREQ + #if defined(CPU_XSCALE_PXA270) && defined(CPU_XSCALE_PXA250) +/* + * On dynamic configuration, assume fastest frequency for early delay(9) + * before tc_init(9), because longer delay(9) is almost harmless during + * device probe and initialization. + */ #include <arm/xscale/pxa2x0cpu.h> -static uint32_t freq; -#define TIMER_FREQUENCY freq +static uint32_t saost_freq = SAOST_MAXFREQ; +#define TIMER_FREQUENCY saost_freq #elif defined(CPU_XSCALE_PXA270) -#define TIMER_FREQUENCY 3250000 /* PXA270 uses 3.25MHz */ +#define TIMER_FREQUENCY PXA270_OST_FREQ #else -#define TIMER_FREQUENCY 3686400 /* 3.6864MHz */ +#define TIMER_FREQUENCY SAOST_FREQ #endif #ifndef STATHZ @@ -230,7 +239,7 @@ cpu_initclocks(void) stathz = STATHZ; profhz = stathz; #if defined(CPU_XSCALE_PXA270) && defined(CPU_XSCALE_PXA250) - TIMER_FREQUENCY = (CPU_IS_PXA250) ? 3686400 : 3250000; + TIMER_FREQUENCY = (CPU_IS_PXA270) ? PXA270_OST_FREQ : SAOST_FREQ; #endif sc->sc_statclock_step = TIMER_FREQUENCY / stathz;