| --- a/sound/soc/codecs/Kconfig |
| +++ b/sound/soc/codecs/Kconfig |
| @@ -164,6 +164,7 @@ |
| select SND_SOC_RT5677 if I2C && SPI_MASTER |
| select SND_SOC_RT5682 if I2C |
| select SND_SOC_SGTL5000 if I2C |
| + select SND_SOC_SI3218X_SPI |
| select SND_SOC_SI476X if MFD_SI476X_CORE |
| select SND_SOC_SIMPLE_AMPLIFIER |
| select SND_SOC_SIRF_AUDIO_CODEC |
| @@ -1484,6 +1485,14 @@ |
| config SND_SOC_NAU8825 |
| tristate |
| |
| +config SND_SOC_SI3218X |
| + tristate |
| + |
| +config SND_SOC_SI3218X_SPI |
| + tristate "Proslic SI3218X" |
| + depends on SPI |
| + select SND_SOC_SI3218X |
| + |
| config SND_SOC_TPA6130A2 |
| tristate "Texas Instruments TPA6130A2 headphone amplifier" |
| depends on I2C |
| --- a/sound/soc/codecs/Makefile |
| +++ b/sound/soc/codecs/Makefile |
| @@ -176,6 +176,7 @@ |
| snd-soc-sigmadsp-objs := sigmadsp.o |
| snd-soc-sigmadsp-i2c-objs := sigmadsp-i2c.o |
| snd-soc-sigmadsp-regmap-objs := sigmadsp-regmap.o |
| +snd-soc-si3218x-spi-objs := si3218x-spi.o |
| snd-soc-si476x-objs := si476x.o |
| snd-soc-sirf-audio-codec-objs := sirf-audio-codec.o |
| snd-soc-spdif-tx-objs := spdif_transmitter.o |
| @@ -563,3 +564,7 @@ |
| obj-$(CONFIG_SND_SOC_MAX98504) += snd-soc-max98504.o |
| obj-$(CONFIG_SND_SOC_SIMPLE_AMPLIFIER) += snd-soc-simple-amplifier.o |
| obj-$(CONFIG_SND_SOC_TPA6130A2) += snd-soc-tpa6130a2.o |
| + |
| +# Proslic si3218x |
| +obj-$(CONFIG_SND_SOC_SI3218X) += si3218x/ |
| +obj-$(CONFIG_SND_SOC_SI3218X_SPI) += snd-soc-si3218x-spi.o |
| --- a/sound/soc/mediatek/Kconfig |
| +++ b/sound/soc/mediatek/Kconfig |
| @@ -53,6 +53,36 @@ |
| Select Y if you have such device. |
| If unsure select "N". |
| |
| +config SND_SOC_MT79XX |
| + tristate "ASoC support for Mediatek MT79XX chip" |
| + depends on ARCH_MEDIATEK |
| + select SND_SOC_MEDIATEK |
| + help |
| + This adds ASoC platform driver support for Mediatek MT79XX chip |
| + that can be used with other codecs. |
| + Select Y if you have such device. |
| + If unsure select "N". |
| + |
| +config SND_SOC_MT79XX_WM8960 |
| + tristate "ASoc Audio driver for MT79XX with WM8960 codec" |
| + depends on SND_SOC_MT79XX && I2C |
| + select SND_SOC_WM8960 |
| + help |
| + This adds ASoC driver for Mediatek MT79XX boards |
| + with the WM8960 codecs. |
| + Select Y if you have such device. |
| + If unsure select "N". |
| + |
| +config SND_SOC_MT79XX_SI3218X |
| + tristate "ASoc Audio driver for MT79XX with SI3218X codec" |
| + depends on SND_SOC_MT79XX && SPI |
| + select SND_SOC_SI3218X_SPI |
| + help |
| + This adds ASoC driver for Mediatek MT79XX boards |
| + with the SI3218X codecs. |
| + Select Y if you have such device. |
| + If unsure select "N". |
| + |
| config SND_SOC_MT8173 |
| tristate "ASoC support for Mediatek MT8173 chip" |
| depends on ARCH_MEDIATEK |
| --- a/sound/soc/mediatek/Makefile |
| +++ b/sound/soc/mediatek/Makefile |
| @@ -2,5 +2,6 @@ |
| obj-$(CONFIG_SND_SOC_MEDIATEK) += common/ |
| obj-$(CONFIG_SND_SOC_MT2701) += mt2701/ |
| obj-$(CONFIG_SND_SOC_MT6797) += mt6797/ |
| +obj-$(CONFIG_SND_SOC_MT79XX) += mt79xx/ |
| obj-$(CONFIG_SND_SOC_MT8173) += mt8173/ |
| obj-$(CONFIG_SND_SOC_MT8183) += mt8183/ |