---

yaml --- r: 124221 b: refs/heads/master c: 209acc0 h: refs/heads/master i: 124219: f56a5b8 v: v3
git-mirror · Dec 29, 2008 · 3dc97d7 · 3dc97d7
1 parent 04a6496
commit 3dc97d7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35ae6f04ad3e4c3ed8a83382b6511bd9beb5c768
+refs/heads/master: 209acc02249d831e7f2e3d8083b6b562dde5fc6f
diff --git a/trunk/drivers/media/video/em28xx/em28xx-core.c b/trunk/drivers/media/video/em28xx/em28xx-core.c
@@ -520,6 +520,8 @@ int em28xx_audio_setup(struct em28xx *dev)
 	/* Try to identify what audio processor we have */
 	if ((vid == 0xffffffff) && (feat == 0x6a90))
 		dev->audio_mode.ac97 = EM28XX_AC97_EM202;
+	else if ((vid >> 8) == 0x838476)
+		dev->audio_mode.ac97 = EM28XX_AC97_SIGMATEL;
 
 init_audio:
 	/* Reports detected AC97 processor */
@@ -530,6 +532,10 @@ int em28xx_audio_setup(struct em28xx *dev)
 	case EM28XX_AC97_EM202:
 		em28xx_info("Empia 202 AC97 audio processor detected\n");
 		break;
+	case EM28XX_AC97_SIGMATEL:
+		em28xx_info("Sigmatel audio processor detected(stac 97%02x)\n",
+			    dev->audio_mode.ac97_vendor_id & 0xff);
+		break;
 	case EM28XX_AC97_OTHER:
 		em28xx_warn("Unknown AC97 audio processor detected!\n");
 		break;

diff --git a/trunk/drivers/media/video/em28xx/em28xx.h b/trunk/drivers/media/video/em28xx/em28xx.h
@@ -259,6 +259,7 @@ enum enum28xx_itype {
 enum em28xx_ac97_mode {
 	EM28XX_NO_AC97 = 0,
 	EM28XX_AC97_EM202,
+	EM28XX_AC97_SIGMATEL,
 	EM28XX_AC97_OTHER,
 };