diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-02-20 21:43:40 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-02-20 21:43:40 +0100 |
| commit | 4e25d30c8ddeae6ad0b68440aacadaacb14f8538 (patch) | |
| tree | 08fe4ac15aec508b370262ad653c83a91be247b5 /arch | |
| parent | d2bb390a2081a36ffe906724d2848d846f2aeb29 (diff) | |
| parent | 141dee78c40ac2c43aa4ff306688d625e1c731de (diff) | |
Merge tag 'asoc-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v4.11
Another release that's mainly focused on drivers rather than core
changes, highlights include:
- A huge batch of updates to the Intel drivers, mainly around
DisplayPort and HDMI with some additional board support too.
- Channel mapping support for HDMI.
- Support for AllWinner A31 and A33, Everest Semiconductor ES8328,
Nuvoton NAU8540.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-s3c64xx/dev-audio.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c64xx/dev-audio.c b/arch/arm/mach-s3c64xx/dev-audio.c index b57783371d52..247dcc0b691e 100644 --- a/arch/arm/mach-s3c64xx/dev-audio.c +++ b/arch/arm/mach-s3c64xx/dev-audio.c @@ -106,9 +106,7 @@ static struct s3c_audio_pdata i2sv4_pdata = { .dma_playback = DMACH_HSI_I2SV40_TX, .dma_capture = DMACH_HSI_I2SV40_RX, .type = { - .i2s = { - .quirks = QUIRK_PRI_6CHAN, - }, + .quirks = QUIRK_PRI_6CHAN, }, }; |