diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-20 10:49:33 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-29 14:53:37 -0500 |
commit | 209acc02249d831e7f2e3d8083b6b562dde5fc6f (patch) | |
tree | a3a1dead086cb66f99062d922f8334e6a2f817f9 /drivers/media/video/em28xx | |
parent | 35ae6f04ad3e4c3ed8a83382b6511bd9beb5c768 (diff) |
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/video/em28xx')
-rw-r--r-- | drivers/media/video/em28xx/em28xx-core.c | 6 | ||||
-rw-r--r-- | drivers/media/video/em28xx/em28xx.h | 1 |
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 8aead5e84d0f..cb60864041e7 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) | |||
520 | /* Try to identify what audio processor we have */ | 520 | /* Try to identify what audio processor we have */ |
521 | if ((vid == 0xffffffff) && (feat == 0x6a90)) | 521 | if ((vid == 0xffffffff) && (feat == 0x6a90)) |
522 | dev->audio_mode.ac97 = EM28XX_AC97_EM202; | 522 | dev->audio_mode.ac97 = EM28XX_AC97_EM202; |
523 | else if ((vid >> 8) == 0x838476) | ||
524 | dev->audio_mode.ac97 = EM28XX_AC97_SIGMATEL; | ||
523 | 525 | ||
524 | init_audio: | 526 | init_audio: |
525 | /* Reports detected AC97 processor */ | 527 | /* Reports detected AC97 processor */ |
@@ -530,6 +532,10 @@ init_audio: | |||
530 | case EM28XX_AC97_EM202: | 532 | case EM28XX_AC97_EM202: |
531 | em28xx_info("Empia 202 AC97 audio processor detected\n"); | 533 | em28xx_info("Empia 202 AC97 audio processor detected\n"); |
532 | break; | 534 | break; |
535 | case EM28XX_AC97_SIGMATEL: | ||
536 | em28xx_info("Sigmatel audio processor detected(stac 97%02x)\n", | ||
537 | dev->audio_mode.ac97_vendor_id & 0xff); | ||
538 | break; | ||
533 | case EM28XX_AC97_OTHER: | 539 | case EM28XX_AC97_OTHER: |
534 | em28xx_warn("Unknown AC97 audio processor detected!\n"); | 540 | em28xx_warn("Unknown AC97 audio processor detected!\n"); |
535 | break; | 541 | break; |
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h index 89e13c599f8d..206f59c1e938 100644 --- a/drivers/media/video/em28xx/em28xx.h +++ b/drivers/media/video/em28xx/em28xx.h | |||
@@ -259,6 +259,7 @@ enum enum28xx_itype { | |||
259 | enum em28xx_ac97_mode { | 259 | enum em28xx_ac97_mode { |
260 | EM28XX_NO_AC97 = 0, | 260 | EM28XX_NO_AC97 = 0, |
261 | EM28XX_AC97_EM202, | 261 | EM28XX_AC97_EM202, |
262 | EM28XX_AC97_SIGMATEL, | ||
262 | EM28XX_AC97_OTHER, | 263 | EM28XX_AC97_OTHER, |
263 | }; | 264 | }; |
264 | 265 | ||