[src/netbsd-8]: src/sys/arch/arm/sa11x0 Pull up following revision(s) (reques...

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

details:   https://anonhg.NetBSD.org/src/rev/5b9e725a02ca
branches:  netbsd-8
changeset: 461124:5b9e725a02ca
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Nov 16 16:35:00 2019 +0000

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

diffstat:

 sys/arch/arm/sa11x0/sa11x0_ost.c |  23 ++++++++++++++++-------
 1 files changed, 16 insertions(+), 7 deletions(-)

diffs (55 lines):

diff -r ed319673c8f3 -r 5b9e725a02ca sys/arch/arm/sa11x0/sa11x0_ost.c
--- a/sys/arch/arm/sa11x0/sa11x0_ost.c  Sat Nov 16 16:32:23 2019 +0000
+++ b/sys/arch/arm/sa11x0/sa11x0_ost.c  Sat Nov 16 16:35:00 2019 +0000
@@ -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 @@
 
 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 @@
        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;