Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[pandora-kernel.git] / drivers / media / video / saa7134 / saa7134-tvaudio.c

diff --git a/drivers/media/video/saa7134/saa7134-tvaudio.c b/drivers/media/video/saa7134/saa7134-tvaudio.c
index 232af59..c5d0b44 100644 (file)
--- a/drivers/media/video/saa7134/saa7134-tvaudio.c
+++ b/drivers/media/video/saa7134/saa7134-tvaudio.c
@@ -477,7 +477,6 @@ static int tvaudio_thread(void *data)
        unsigned int i, audio, nscan;
        int max1,max2,carrier,rx,mode,lastmode,default_carrier;
 
-
        set_freezable();
 
        for (;;) {
@@ -775,7 +774,6 @@ static int tvaudio_thread_ddep(void *data)
        struct saa7134_dev *dev = data;
        u32 value, norms;
 
-
        set_freezable();
        for (;;) {
                tvaudio_sleep(dev,-1);
@@ -873,13 +871,34 @@ void saa7134_enable_i2s(struct saa7134_dev *dev)
 
        if (!card_is_empress(dev))
                return;
-       i2s_format = (dev->input->amux == TV) ? 0x00 : 0x01;
 
-       /* enable I2S audio output for the mpeg encoder */
-       saa_writeb(SAA7134_I2S_OUTPUT_SELECT,  0x80);
-       saa_writeb(SAA7134_I2S_OUTPUT_FORMAT,  i2s_format);
-       saa_writeb(SAA7134_I2S_OUTPUT_LEVEL,   0x0F);
-       saa_writeb(SAA7134_I2S_AUDIO_OUTPUT,   0x01);
+       if (dev->pci->device == PCI_DEVICE_ID_PHILIPS_SAA7130)
+               return;
+
+       /* configure GPIO for out */
+       saa_andorl(SAA7134_GPIO_GPMODE0 >> 2, 0x0E000000, 0x00000000);
+
+       switch (dev->pci->device) {
+       case PCI_DEVICE_ID_PHILIPS_SAA7133:
+       case PCI_DEVICE_ID_PHILIPS_SAA7135:
+           /* Set I2S format (SONY)  */
+           saa_writeb(SAA7133_I2S_AUDIO_CONTROL, 0x00);
+           /* Start I2S */
+           saa_writeb(SAA7134_I2S_AUDIO_OUTPUT, 0x11);
+           break;
+
+       case PCI_DEVICE_ID_PHILIPS_SAA7134:
+           i2s_format = (dev->input->amux == TV) ? 0x00 : 0x01;
+
+           /* enable I2S audio output for the mpeg encoder */
+           saa_writeb(SAA7134_I2S_OUTPUT_SELECT, 0x80);
+           saa_writeb(SAA7134_I2S_OUTPUT_FORMAT, i2s_format);
+           saa_writeb(SAA7134_I2S_OUTPUT_LEVEL,  0x0F);
+           saa_writeb(SAA7134_I2S_AUDIO_OUTPUT,  0x01);
+
+       default:
+           break;
+       }
 }
 
 int saa7134_tvaudio_rx2mode(u32 rx)