Merge branch 'rusty-cpumask-parisc' into parisc

[firefly-linux-kernel-4.4.55.git] / drivers / media / video / cx88 / cx88-tvaudio.c

diff --git a/drivers/media/video/cx88/cx88-tvaudio.c b/drivers/media/video/cx88/cx88-tvaudio.c
index 3a1977f41e277ddd681694398ae8de01335cdf5a..7dd506b987fe76d06be6788104f67ce88cd72bc2 100644 (file)
--- a/drivers/media/video/cx88/cx88-tvaudio.c
+++ b/drivers/media/video/cx88/cx88-tvaudio.c
@@ -767,6 +767,14 @@ void cx88_set_tvaudio(struct cx88_core *core)
        case WW_FM:
                set_audio_standard_FM(core, radio_deemphasis);
                break;
+       case WW_I2SADC:
+               set_audio_start(core, 0x01);
+               /* Slave/Philips/Autobaud */
+               cx_write(AUD_I2SINPUTCNTL, 0);
+               /* Switch to "I2S ADC mode" */
+               cx_write(AUD_I2SCNTL, 0x1);
+               set_audio_finish(core, EN_I2SIN_ENABLE);
+               break;
        case WW_NONE:
        default:
                printk("%s/0: unknown tv audio mode [%d]\n",
@@ -895,6 +903,9 @@ void cx88_set_stereo(struct cx88_core *core, u32 mode, int manual)
                        break;
                }
                break;
+       case WW_I2SADC:
+               /* DO NOTHING */
+               break;
        }
 
        if (UNSET != ctl) {