V4L/DVB (6955): Properly implement 12MHz I2S support
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 78be0dc..1011813 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -174,13 +174,14 @@
} },
},
[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 @@
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 @@
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:
diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c
index 70c5ec2..f6b7835 100644
--- a/drivers/media/video/em28xx/em28xx-core.c
+++ b/drivers/media/video/em28xx/em28xx-core.c
@@ -332,6 +332,7 @@
{
int ret;
char s[2] = { 0x00, 0x00 };
+ u8 xclk = 0x07;
s[0] |= 0x1f - dev->volume;
s[1] |= 0x1f - dev->volume;
@@ -342,10 +343,16 @@
if (ret < 0)
return ret;
- ret = em28xx_write_reg_bits(dev, XCLK_REG,
- dev->mute ? 0x00 : 0x80, 0x80);
+ if (dev->has_12mhz_i2s)
+ xclk |= 0x20;
+
+ if (!dev->mute)
+ xclk |= 0x80;
+
+ ret = em28xx_write_reg_bits(dev, XCLK_REG, xclk, 0xa7);
if (ret < 0)
return ret;
+ msleep(10);
/* Selects the proper audio input */
ret = em28xx_set_audio_source(dev);
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index a03e9d7..0f075f5 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -125,10 +125,6 @@
dev->mute = 1; /* maybe not the right place... */
dev->volume = 0x1f;
- /* Init XCLK_REG, audio muted */
- dev->em28xx_write_regs(dev, XCLK_REG, "\x87", 1);
-
- em28xx_audio_analog_set(dev);
em28xx_outfmt_set_yuv422(dev);
em28xx_colorlevels_set_default(dev);
em28xx_compression_disable(dev);
@@ -1688,6 +1684,9 @@
/* Do board specific init and eeprom reading */
em28xx_card_setup(dev);
+ /* Configure audio */
+ em28xx_audio_analog_set(dev);
+
/* configure the device */
em28xx_config_i2c(dev);
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index 9eb2131..2d57330 100644
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -184,6 +184,8 @@
unsigned int has_tuner:1;
unsigned int has_msp34xx:1;
unsigned int mts_firmware:1;
+ unsigned int has_12mhz_i2s:1;
+
unsigned int analog_gpio;
enum em28xx_decoder decoder;
@@ -247,6 +249,7 @@
unsigned int has_tda9887:1;
unsigned int stream_on:1; /* Locks streams */
unsigned int has_audio_class:1;
+ unsigned int has_12mhz_i2s:1;
int video_inputs; /* number of video inputs */
struct list_head devlist;