diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-05 17:01:41 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-25 19:04:33 -0200 |
| commit | 3abee53e4402b6ae39e1e610f9ef94eb74097138 (patch) | |
| tree | bb96b460ebf6be07a127216dda86a1f896274afd /drivers/media/video/em28xx/em28xx-cards.c | |
| parent | 0f6dac18ccc6fb0c95f3e0269e60239661c9b4c5 (diff) | |
| download | kernel-crypto-3abee53e4402b6ae39e1e610f9ef94eb74097138.tar.gz kernel-crypto-3abee53e4402b6ae39e1e610f9ef94eb74097138.tar.xz kernel-crypto-3abee53e4402b6ae39e1e610f9ef94eb74097138.zip | |
V4L/DVB (6955): Properly implement 12MHz I2S support
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/em28xx/em28xx-cards.c')
| -rw-r--r-- | drivers/media/video/em28xx/em28xx-cards.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c index 78be0dc2572..1011813ad7c 100644 --- a/drivers/media/video/em28xx/em28xx-cards.c +++ b/drivers/media/video/em28xx/em28xx-cards.c @@ -174,13 +174,14 @@ struct em28xx_board em28xx_boards[] = { } }, }, [EM2880_BOARD_HAUPPAUGE_WINTV_HVR_950] = { - .name = "Hauppauge WinTV HVR 950", - .vchannels = 3, - .tda9887_conf = TDA9887_PRESENT, - .tuner_type = TUNER_XC2028, - .has_tuner = 1, - .mts_firmware = 1, - .decoder = EM28XX_TVP5150, + .name = "Hauppauge WinTV HVR 950", + .vchannels = 3, + .tda9887_conf = TDA9887_PRESENT, + .tuner_type = TUNER_XC2028, + .has_tuner = 1, + .mts_firmware = 1, + .has_12mhz_i2s = 1, + .decoder = EM28XX_TVP5150, .input = { { .type = EM28XX_VMUX_TELEVISION, .vmux = TVP5150_COMPOSITE0, @@ -641,6 +642,7 @@ static void em28xx_set_model(struct em28xx *dev) dev->decoder = em28xx_boards[dev->model].decoder; dev->video_inputs = em28xx_boards[dev->model].vchannels; dev->analog_gpio = em28xx_boards[dev->model].analog_gpio; + dev->has_12mhz_i2s = em28xx_boards[dev->model].has_12mhz_i2s; if (!em28xx_boards[dev->model].has_tuner) dev->tuner_type = UNSET; @@ -676,10 +678,6 @@ void em28xx_card_setup(struct em28xx *dev) if (tv.has_ir) request_module("ir-kbd-i2c"); #endif - /* enable audio 12 mhz i2s */ - em28xx_write_regs(dev, XCLK_REG, "\xa7", 1); - msleep(10); - break; } case EM2820_BOARD_KWORLD_PVRTV2800RF: |