Merge remote-tracking branches 'asoc/topic/es7134', 'asoc/topic/es8328', 'asoc/topic/fsl', 'asoc/topic/fsl-asrc' and 'asoc/topic/fsl-esai' into asoc-next

This commit is contained in:
Mark Brown
2017-04-30 22:15:55 +09:00
16 changed files with 173 additions and 35 deletions

View File

@ -74,6 +74,7 @@ config SND_SOC_ALL_CODECS
select SND_SOC_DMIC
select SND_SOC_ES8328_SPI if SPI_MASTER
select SND_SOC_ES8328_I2C if I2C
select SND_SOC_ES7134
select SND_SOC_GTM601
select SND_SOC_HDAC_HDMI
select SND_SOC_ICS43432
@ -537,6 +538,9 @@ config SND_SOC_HDMI_CODEC
select SND_PCM_IEC958
select HDMI
config SND_SOC_ES7134
tristate "Everest Semi ES7134 CODEC"
config SND_SOC_ES8328
tristate