aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2008-11-20 12:49:33 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-12-29 17:53:37 -0200
commit209acc02249d831e7f2e3d8083b6b562dde5fc6f (patch)
treea3a1dead086cb66f99062d922f8334e6a2f817f9 /drivers/media
parent35ae6f04ad3e4c3ed8a83382b6511bd9beb5c768 (diff)
downloadkernel_samsung_smdk4412-209acc02249d831e7f2e3d8083b6b562dde5fc6f.zip
kernel_samsung_smdk4412-209acc02249d831e7f2e3d8083b6b562dde5fc6f.tar.gz
kernel_samsung_smdk4412-209acc02249d831e7f2e3d8083b6b562dde5fc6f.tar.bz2
V4L/DVB (9671): em28xx: Add detection of Sigmatel Stac97xx series of AC97 devices
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/em28xx/em28xx-core.c6
-rw-r--r--drivers/media/video/em28xx/em28xx.h1
2 files changed, 7 insertions, 0 deletions
diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c
index 8aead5e..cb60864 100644
--- a/drivers/media/video/em28xx/em28xx-core.c
+++ b/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 @@ init_audio:
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/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index 89e13c5..206f59c 100644
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/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,
};