From: Mark Brown <broonie@kernel.org>
Date: Mon, 11 Jan 2016 13:54:31 +0000 (+0000)
Subject: Merge remote-tracking branch 'asoc/topic/pcm1792a' into asoc-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=51a545a343a4af02c7c1f27822c9dc63b6a8280b;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge remote-tracking branch 'asoc/topic/pcm1792a' into asoc-next
---

51a545a343a4af02c7c1f27822c9dc63b6a8280b
diff --cc sound/soc/codecs/Kconfig
index 629ee56a22ce,b28060e55006..50693c867e71
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@@ -87,10 -83,8 +87,10 @@@ config SND_SOC_ALL_CODEC
  	select SND_SOC_ML26124 if I2C
  	select SND_SOC_NAU8825 if I2C
  	select SND_SOC_PCM1681 if I2C
- 	select SND_SOC_PCM1792A if SPI_MASTER
+ 	select SND_SOC_PCM179X if SPI_MASTER
  	select SND_SOC_PCM3008
 +	select SND_SOC_PCM3168A_I2C if I2C
 +	select SND_SOC_PCM3168A_SPI if SPI_MASTER
  	select SND_SOC_PCM512x_I2C if I2C
  	select SND_SOC_PCM512x_SPI if SPI_MASTER
  	select SND_SOC_RT286 if I2C
diff --cc sound/soc/codecs/Makefile
index fb846e2ad33b,e4256039ff80..d44f7d347183
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@@ -80,11 -76,8 +80,11 @@@ snd-soc-mc13783-objs := mc13783.
  snd-soc-ml26124-objs := ml26124.o
  snd-soc-nau8825-objs := nau8825.o
  snd-soc-pcm1681-objs := pcm1681.o
- snd-soc-pcm1792a-codec-objs := pcm1792a.o
+ snd-soc-pcm179x-codec-objs := pcm179x.o
  snd-soc-pcm3008-objs := pcm3008.o
 +snd-soc-pcm3168a-objs := pcm3168a.o
 +snd-soc-pcm3168a-i2c-objs := pcm3168a-i2c.o
 +snd-soc-pcm3168a-spi-objs := pcm3168a-spi.o
  snd-soc-pcm512x-objs := pcm512x.o
  snd-soc-pcm512x-i2c-objs := pcm512x-i2c.o
  snd-soc-pcm512x-spi-objs := pcm512x-spi.o
@@@ -284,11 -271,8 +284,11 @@@ obj-$(CONFIG_SND_SOC_MC13783)	+= snd-so
  obj-$(CONFIG_SND_SOC_ML26124)	+= snd-soc-ml26124.o
  obj-$(CONFIG_SND_SOC_NAU8825)   += snd-soc-nau8825.o
  obj-$(CONFIG_SND_SOC_PCM1681)	+= snd-soc-pcm1681.o
- obj-$(CONFIG_SND_SOC_PCM1792A)	+= snd-soc-pcm1792a-codec.o
+ obj-$(CONFIG_SND_SOC_PCM179X)	+= snd-soc-pcm179x-codec.o
  obj-$(CONFIG_SND_SOC_PCM3008)	+= snd-soc-pcm3008.o
 +obj-$(CONFIG_SND_SOC_PCM3168A)	+= snd-soc-pcm3168a.o
 +obj-$(CONFIG_SND_SOC_PCM3168A_I2C)	+= snd-soc-pcm3168a-i2c.o
 +obj-$(CONFIG_SND_SOC_PCM3168A_SPI)	+= snd-soc-pcm3168a-spi.o
  obj-$(CONFIG_SND_SOC_PCM512x)	+= snd-soc-pcm512x.o
  obj-$(CONFIG_SND_SOC_PCM512x_I2C)	+= snd-soc-pcm512x-i2c.o
  obj-$(CONFIG_SND_SOC_PCM512x_SPI)	+= snd-soc-pcm512x-spi.o