diff options
| author | Devin Heitmueller <devin.heitmueller@gmail.com> | 2008-11-12 02:05:24 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-29 17:53:32 -0200 |
| commit | ebef13d480f0223512963ee785bd93770d404fe3 (patch) | |
| tree | c93421d0cd8466bc2659675f8607eddb42f980ee /drivers/media/video/em28xx/em28xx-core.c | |
| parent | 24a613e4b08c4077b4c809bebab1d4a36d541fcc (diff) | |
| download | kernel_samsung_smdk4412-ebef13d480f0223512963ee785bd93770d404fe3.zip kernel_samsung_smdk4412-ebef13d480f0223512963ee785bd93770d404fe3.tar.gz kernel_samsung_smdk4412-ebef13d480f0223512963ee785bd93770d404fe3.tar.bz2 | |
V4L/DVB (9589): Properly support capture start on em2874
Properly support capture start on em2874
The transport stream enable register moved in the em2874, so make it work
properly.
Thanks for Ray Lu from Empia for providing the em2874 datasheet.
Signed-off-by: Devin Heitmueller <devin.heitmueller@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/em28xx/em28xx-core.c')
| -rw-r--r-- | drivers/media/video/em28xx/em28xx-core.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c index 0945489..d4dee84 100644 --- a/drivers/media/video/em28xx/em28xx-core.c +++ b/drivers/media/video/em28xx/em28xx-core.c @@ -373,6 +373,24 @@ int em28xx_colorlevels_set_default(struct em28xx *dev) int em28xx_capture_start(struct em28xx *dev, int start) { int rc; + + if (dev->chip_id == CHIP_ID_EM2874) { + /* The Transport Stream Enable Register moved in em2874 */ + if (!start) { + rc = em28xx_write_reg_bits(dev, EM2874_R5F_TS_ENABLE, + 0x00, + EM2874_TS1_CAPTURE_ENABLE); + return rc; + } + + /* Enable Transport Stream */ + rc = em28xx_write_reg_bits(dev, EM2874_R5F_TS_ENABLE, + EM2874_TS1_CAPTURE_ENABLE, + EM2874_TS1_CAPTURE_ENABLE); + return rc; + } + + /* FIXME: which is the best order? */ /* video registers are sampled by VREF */ rc = em28xx_write_reg_bits(dev, EM28XX_R0C_USBSUSP, |