alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
From: Wu Fengguang <fengguang.wu@intel.com>
To: Takashi Iwai <tiwai@suse.de>
Cc: alsa-devel@alsa-project.org, Wu Fengguang <fengguang.wu@intel.com>
Subject: [PATCH 2/5] hda - allow up to 10 Azalia codecs
Date: Wed, 12 May 2010 09:30:17 +0800	[thread overview]
Message-ID: <20100512015713.872250021@intel.com> (raw)
In-Reply-To: 20100512013015.752623810@intel.com

[-- Attachment #1: alsa-max-codecs.patch --]
[-- Type: text/plain, Size: 1343 bytes --]

Currently AZX_MAX_CODECS is defined to 8. Increase it to 10 in order to
support the HDMI device indices {3, 7, 8, 9}.

The HD audio spec allows up to 14 codecs. So we are still within the
hardware capacity.

Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
---
 sound/pci/hda/hda_intel.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- sound-2.6.orig/sound/pci/hda/hda_intel.c	2010-05-10 09:40:20.000000000 +0800
+++ sound-2.6/sound/pci/hda/hda_intel.c	2010-05-11 13:02:51.000000000 +0800
@@ -267,7 +267,7 @@ enum { SDI0, SDI1, SDI2, SDI3, SDO0, SDO
 #define RIRB_INT_MASK		0x05
 
 /* STATESTS int mask: S3,SD2,SD1,SD0 */
-#define AZX_MAX_CODECS		8
+#define AZX_MAX_CODECS		10
 #define AZX_DEFAULT_CODECS	4
 #define STATESTS_INT_MASK	((1 << AZX_MAX_CODECS) - 1)
 
@@ -866,7 +866,7 @@ static int azx_reset(struct azx *chip, i
 		goto __skip;
 
 	/* clear STATESTS */
-	azx_writeb(chip, STATESTS, STATESTS_INT_MASK);
+	azx_writew(chip, STATESTS, STATESTS_INT_MASK);
 
 	/* reset controller */
 	azx_writel(chip, GCTL, azx_readl(chip, GCTL) & ~ICH6_GCTL_RESET);
@@ -956,7 +956,7 @@ static void azx_int_clear(struct azx *ch
 	}
 
 	/* clear STATESTS */
-	azx_writeb(chip, STATESTS, STATESTS_INT_MASK);
+	azx_writew(chip, STATESTS, STATESTS_INT_MASK);
 
 	/* clear rirb status */
 	azx_writeb(chip, RIRBSTS, RIRB_INT_MASK);

  parent reply	other threads:[~2010-05-12  1:58 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-05-12  1:30 [PATCH 0/5] updates for Intel SandyBridge/CougarPoint HDMI codec Wu Fengguang
2010-05-12  1:30 ` [PATCH 1/5] allow up to 32 PCM devices Wu Fengguang
2010-05-12  7:29   ` Jaroslav Kysela
2010-05-12  8:03     ` Takashi Iwai
2010-05-12  8:39       ` Wu Fengguang
2010-05-12  9:01         ` Takashi Iwai
2010-05-12 10:06           ` Wu Fengguang
2010-05-13  0:05             ` Eliot Blennerhassett
2010-05-12 10:20           ` Clemens Ladisch
2010-05-12 10:55             ` Takashi Iwai
2010-05-13  2:21               ` Wu Fengguang
2010-05-14  8:21                 ` Takashi Iwai
2010-05-14  8:32                   ` Wu Fengguang
2010-05-12  9:49       ` Jaroslav Kysela
2010-05-12  1:30 ` Wu Fengguang [this message]
2010-05-12 14:35   ` [PATCH 2/5] hda - allow up to 10 Azalia codecs Takashi Iwai
2010-05-13  3:03     ` Wu Fengguang
2010-05-12  1:30 ` [PATCH 3/5] intelhdmi - user friendly codec name Wu Fengguang
2010-05-12  1:30 ` [PATCH 4/5] intelhdmi - add id for the CougarPoint chipset Wu Fengguang
2010-05-12  1:30 ` [PATCH 5/5] hdmi - dont fail on extra nodes Wu Fengguang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20100512015713.872250021@intel.com \
    --to=fengguang.wu@intel.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=tiwai@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).