diff options
author | Lawrence Rust <lawrence@softsystem.co.uk> | 2011-02-06 15:46:12 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-03-21 19:32:19 -0400 |
commit | 6951803c2402d1af0e76df051cc9b117f504550f (patch) | |
tree | b7e64b2226a0873e9e8ba421fc21a69079ff9f35 /drivers/media/video/cx88/cx88-cards.c | |
parent | 724dcbfa9c24af5afdaa2b7e0449e20066d6555a (diff) |
[media] Add proper audio support for Nova-S Plus with wm8775 ADC
This patch adds audio DMA capture and ALSA mixer elements for the line
input jack of the Hauppauge Nova-S-plus DVB-S PCI card. The Nova-S-plus
has a WM8775 ADC that is currently not detected. This patch enables
this chip and exports volume, balance mute and ALC elements for ALSA
mixer controls.
[mchehab@redhat.com: Changed the patch to only talk with wm8775 if board
info says so. Also, added platform_data support, to avoid changing the
behaviour for other boards, and fixed CodingStyle]
[awalls@md.metrocast.net: Changed patch to make the WM8775_GID defintion
bridge driver private and let the bridge driver set the value of
v4l2_subdev.grp_id.]
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Andy Walls <awalls@md.metrocast.net>
Diffstat (limited to 'drivers/media/video/cx88/cx88-cards.c')
-rw-r--r-- | drivers/media/video/cx88/cx88-cards.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c index 8128b936c686..f735262f4767 100644 --- a/drivers/media/video/cx88/cx88-cards.c +++ b/drivers/media/video/cx88/cx88-cards.c | |||
@@ -970,7 +970,8 @@ static const struct cx88_board cx88_boards[] = { | |||
970 | .radio_type = UNSET, | 970 | .radio_type = UNSET, |
971 | .tuner_addr = ADDR_UNSET, | 971 | .tuner_addr = ADDR_UNSET, |
972 | .radio_addr = ADDR_UNSET, | 972 | .radio_addr = ADDR_UNSET, |
973 | .audio_chip = V4L2_IDENT_WM8775, | 973 | .audio_chip = V4L2_IDENT_WM8775, |
974 | .i2sinputcntl = 2, | ||
974 | .input = {{ | 975 | .input = {{ |
975 | .type = CX88_VMUX_DVB, | 976 | .type = CX88_VMUX_DVB, |
976 | .vmux = 0, | 977 | .vmux = 0, |