1 files changed, 18 insertions, 6 deletions

diff --git a/drivers/media/video/saa7134/saa7134-tvaudio.c b/drivers/media/video/saa7134/saa7134-tvaudio.c
index 232af598d947..460d4a35e5f1 100644
--- a/drivers/media/video/saa7134/saa7134-tvaudio.c
+++ b/drivers/media/video/saa7134/saa7134-tvaudio.c
@@ -873,13 +873,25 @@ 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);
+        switch (dev->board) {
+        case SAA7134_BOARD_BEHOLD_M6:
+            /* configure GPIO for out audio */
+            saa_andorl(SAA7134_GPIO_GPMODE0 >> 2, 0x0E000000, 0x00000000);
+            /* Set I2S format  */
+            saa_writeb(SAA7134_I2S_AUDIO_CONTROL,  0x00);
+            /* Start I2S */
+            saa_writeb(SAA7134_I2S_AUDIO_OUTPUT,   0x11);
+            break;
+        default:
+            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);
+        }
 }
 
 int saa7134_tvaudio_rx2mode(u32 rx)