summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/uts/sun/io/audio/sada/drv/audio1575/audio1575.c14
-rw-r--r--usr/src/uts/sun/sys/audio/impl/audio1575_impl.h9
2 files changed, 13 insertions, 10 deletions
diff --git a/usr/src/uts/sun/io/audio/sada/drv/audio1575/audio1575.c b/usr/src/uts/sun/io/audio/sada/drv/audio1575/audio1575.c
index 93d1330051..391177f565 100644
--- a/usr/src/uts/sun/io/audio/sada/drv/audio1575/audio1575.c
+++ b/usr/src/uts/sun/io/audio/sada/drv/audio1575/audio1575.c
@@ -2,9 +2,8 @@
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
*
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
* or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -2404,7 +2403,7 @@ audio1575_init_ac97(audio1575_state_t *statep, int restore)
ASSERT(mutex_owned(&statep->m1575_intr_mutex));
- ticks = drv_usectohz(M1575_LOOP_CTR);
+ ticks = drv_usectohz(AD1981_POWERON_DELAY_USEC);
/* AC97 register reset */
if (audio1575_reset_ac97(statep) != AUDIO_SUCCESS) {
@@ -2419,7 +2418,10 @@ audio1575_init_ac97(audio1575_state_t *statep, int restore)
(void) audio1575_write_ac97(statep,
AC97_POWERDOWN_CTRL_STAT_REGISTER, sr & 0x00ff);
- /* wait for the analog section to power up */
+ /*
+ * Wait 1 sec for the analog section to power up
+ * checking every 10 ms.
+ */
for (i = 0; i < M1575_LOOP_CTR; i++) {
(void) audio1575_read_ac97(statep,
AC97_POWERDOWN_CTRL_STAT_REGISTER, &sr);
diff --git a/usr/src/uts/sun/sys/audio/impl/audio1575_impl.h b/usr/src/uts/sun/sys/audio/impl/audio1575_impl.h
index aba1b2bfca..0e7397aa6d 100644
--- a/usr/src/uts/sun/sys/audio/impl/audio1575_impl.h
+++ b/usr/src/uts/sun/sys/audio/impl/audio1575_impl.h
@@ -2,9 +2,8 @@
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
*
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
* or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -116,6 +115,8 @@ extern "C" {
#define AC97_MIXER_ADC_GAIN_REGISTER 0x64
#define MIXER_GAIN_MUTE 0x8000
#define MIXER_0db_GAIN_ 0x0000
+/* Check for poweron status every 10 ms */
+#define AD1981_POWERON_DELAY_USEC 10000
/* PCI CFG SPACE REGISTERS for Audio (Device 29, Function 0) */
#define M1575_PCIID_REG 0x00 /* Vendor ID 32 */