summaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/em28xx/em28xx-core.c
diff options
context:
space:
mode:
authorAntti Palosaari <crope@iki.fi>2013-02-25 08:19:04 -0300
committerMauro Carvalho Chehab <m.chehab@samsung.com>2013-12-18 07:18:14 -0200
commit9f1d0bdab24f536f82041fe2338f24b3b08d08a1 (patch)
tree2e691e98e00b188feb5a3094893429e9ff239abe /drivers/media/usb/em28xx/em28xx-core.c
parentbd6f27458b0c50469ba1bb0a53e5ad1ac9e950d5 (diff)
downloadop-kernel-dev-9f1d0bdab24f536f82041fe2338f24b3b08d08a1.zip
op-kernel-dev-9f1d0bdab24f536f82041fe2338f24b3b08d08a1.tar.gz
[media] em28xx: add support for Empia EM28178
New chip version, which is very similar than EM28174. Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/usb/em28xx/em28xx-core.c')
-rw-r--r--drivers/media/usb/em28xx/em28xx-core.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/media/usb/em28xx/em28xx-core.c b/drivers/media/usb/em28xx/em28xx-core.c
index fc82540..f6076a5 100644
--- a/drivers/media/usb/em28xx/em28xx-core.c
+++ b/drivers/media/usb/em28xx/em28xx-core.c
@@ -501,8 +501,10 @@ int em28xx_audio_setup(struct em28xx *dev)
int vid1, vid2, feat, cfg;
u32 vid;
- if (dev->chip_id == CHIP_ID_EM2870 || dev->chip_id == CHIP_ID_EM2874
- || dev->chip_id == CHIP_ID_EM28174) {
+ if (dev->chip_id == CHIP_ID_EM2870 ||
+ dev->chip_id == CHIP_ID_EM2874 ||
+ dev->chip_id == CHIP_ID_EM28174 ||
+ dev->chip_id == CHIP_ID_EM28178) {
/* Digital only device - don't load any alsa module */
dev->audio_mode.has_audio = false;
dev->has_audio_class = false;
@@ -641,7 +643,8 @@ int em28xx_capture_start(struct em28xx *dev, int start)
if (dev->chip_id == CHIP_ID_EM2874 ||
dev->chip_id == CHIP_ID_EM2884 ||
- dev->chip_id == CHIP_ID_EM28174) {
+ dev->chip_id == CHIP_ID_EM28174 ||
+ dev->chip_id == CHIP_ID_EM28178) {
/* The Transport Stream Enable Register moved in em2874 */
rc = em28xx_write_reg_bits(dev, EM2874_R5F_TS_ENABLE,
start ?
OpenPOWER on IntegriCloud