Merge remote-tracking branches 'asoc/topic/rt5514', 'asoc/topic/rt5616', 'asoc/topic...

diff --cc sound/soc/codecs/Kconfig
index c0287a9e8cdf131f39bc6395f1d3ba574d92a742,dabd479bf1f09317f4ba946fdefc00149e4ff2d0,50693c867e71d06a2b6ccebf0d2f303c1ef9a0f5,f22c66bde292929f8d311a5ccb5025ae2f5ae364,50693c867e71d06a2b6ccebf0d2f303c1ef9a0f5,50693c867e71d06a2b6ccebf0d2f303c1ef9a0f5..4383966c13c4132505a984c51a11a8cb05b6c74d
--- 1/sound/soc/codecs/Kconfig
--- 2/sound/soc/codecs/Kconfig
--- 3/sound/soc/codecs/Kconfig
--- 4/sound/soc/codecs/Kconfig
--- 5/sound/soc/codecs/Kconfig
--- 6/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@@@@@@ -88,16 -87,16 -87,15 -83,12 -87,15 -87,15 +88,17 @@@@@@@ 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_PCM179X if SPI_MASTER
   -    select SND_SOC_PCM1792A if SPI_MASTER
 +++++  select SND_SOC_PCM179X_I2C if I2C
 +++++  select SND_SOC_PCM179X_SPI 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
        select SND_SOC_RT298 if I2C
+ ++++  select SND_SOC_RT5514 if I2C
   +    select SND_SOC_RT5616 if I2C
        select SND_SOC_RT5631 if I2C
        select SND_SOC_RT5640 if I2C
        select SND_SOC_RT5645 if I2C
@@@@@@@ -497,10 -496,9 -495,9 -472,6 -495,9 -495,9 +498,10 @@@@@@@ config SND_SOC_HDAC_HDM
      config SND_SOC_ICS43432
        tristate
      
   +  config SND_SOC_INNO_RK3036
   +    tristate "Inno codec driver for RK3036 SoC"
 +++++  select REGMAP_MMIO
   +  
      config SND_SOC_ISABELLE
              tristate
      
@@@@@@@ -532,24 -527,9 -526,9 -500,9 -526,9 -526,9 +533,24 @@@@@@@ config SND_SOC_PCM168
        tristate "Texas Instruments PCM1681 CODEC"
        depends on I2C
      
   -  config SND_SOC_PCM1792A
   -    tristate "Texas Instruments PCM1792A CODEC"
   +  config SND_SOC_PCM179X
 -- --  tristate "Texas Instruments PCM179X CODEC"
 +++++  tristate
 +++++
 +++++config SND_SOC_PCM179X_I2C
 +++++  tristate "Texas Instruments PCM179X CODEC (I2C)"
 +++++  depends on I2C
 +++++  select SND_SOC_PCM179X
 +++++  help
 +++++    Enable support for Texas Instruments PCM179x CODEC.
 +++++    Select this if your PCM179x is connected via an I2C bus.
 +++++
 +++++config SND_SOC_PCM179X_SPI
 +++++  tristate "Texas Instruments PCM179X CODEC (SPI)"
        depends on SPI_MASTER
 +++++  select SND_SOC_PCM179X
 +++++  help
 +++++    Enable support for Texas Instruments PCM179x CODEC.
 +++++    Select this if your PCM179x is connected via an SPI bus.
      
      config SND_SOC_PCM3008
             tristate
@@@@@@@ -586,14 -566,16 -565,14 -524,12 -565,14 -565,14 +587,16 @@@@@@@ config SND_SOC_PCM512x_SP
      
      config SND_SOC_RL6231
        tristate
+ ++++  default y if SND_SOC_RT5514=y
   +    default y if SND_SOC_RT5616=y
        default y if SND_SOC_RT5640=y
        default y if SND_SOC_RT5645=y
        default y if SND_SOC_RT5651=y
        default y if SND_SOC_RT5659=y
        default y if SND_SOC_RT5670=y
        default y if SND_SOC_RT5677=y
+ ++++  default m if SND_SOC_RT5514=m
   +    default m if SND_SOC_RT5616=m
        default m if SND_SOC_RT5640=m
        default m if SND_SOC_RT5645=m
        default m if SND_SOC_RT5651=m
@@@@@@@ -616,9 -598,12 -595,9 -552,6 -595,9 -595,9 +619,12 @@@@@@@ config SND_SOC_RT29
        tristate
        depends on I2C
      
+ ++++config SND_SOC_RT5514
+ ++++  tristate
+ ++++
   +  config SND_SOC_RT5616
   +    tristate
   +  
      config SND_SOC_RT5631
        tristate "Realtek ALC5631/RT5631 CODEC"
        depends on I2C

diff --cc sound/soc/codecs/Makefile
index 897ca623ea4502954dced70c6a751b9492082174,79f95dd4ed68e62e3114ddc3190e3c953d05400f,d44f7d347183cbe9a0aca29826b9c6477c52d6c4,418e89eb25ca8acb3e8a2fc1381e8a957b7183f6,d44f7d347183cbe9a0aca29826b9c6477c52d6c4,d44f7d347183cbe9a0aca29826b9c6477c52d6c4..cd05e702c89552420c21cec4f82ea77dabe5c52a
--- 1/sound/soc/codecs/Makefile
--- 2/sound/soc/codecs/Makefile
--- 3/sound/soc/codecs/Makefile
--- 4/sound/soc/codecs/Makefile
--- 5/sound/soc/codecs/Makefile
--- 6/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@@@@@@ -81,13 -80,11 -80,11 -76,8 -80,11 -80,11 +81,13 @@@@@@@ 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-pcm179x-i2c-objs := pcm179x-i2c.o
 +++++snd-soc-pcm179x-spi-objs := pcm179x-spi.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
@@@@@@@ -95,7 -92,8 -92,7 -85,6 -92,7 -92,7 +95,8 @@@@@@@ snd-soc-rl6231-objs := rl6231.
      snd-soc-rl6347a-objs := rl6347a.o
      snd-soc-rt286-objs := rt286.o
      snd-soc-rt298-objs := rt298.o
+ ++++snd-soc-rt5514-objs := rt5514.o
   +  snd-soc-rt5616-objs := rt5616.o
      snd-soc-rt5631-objs := rt5631.o
      snd-soc-rt5640-objs := rt5640.o
      snd-soc-rt5645-objs := rt5645.o
@@@@@@@ -288,13 -285,11 -284,11 -272,8 -284,11 -284,11 +289,13 @@@@@@@ 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_PCM179X_I2C) += snd-soc-pcm179x-i2c.o
 +++++obj-$(CONFIG_SND_SOC_PCM179X_SPI) += snd-soc-pcm179x-spi.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
@@@@@@@ -302,7 -297,8 -296,7 -281,6 -296,7 -296,7 +303,8 @@@@@@@ obj-$(CONFIG_SND_SOC_RL6231)   += snd-soc
      obj-$(CONFIG_SND_SOC_RL6347A)     += snd-soc-rl6347a.o
      obj-$(CONFIG_SND_SOC_RT286)       += snd-soc-rt286.o
      obj-$(CONFIG_SND_SOC_RT298)       += snd-soc-rt298.o
+ ++++obj-$(CONFIG_SND_SOC_RT5514)      += snd-soc-rt5514.o
   +  obj-$(CONFIG_SND_SOC_RT5616)      += snd-soc-rt5616.o
      obj-$(CONFIG_SND_SOC_RT5631)      += snd-soc-rt5631.o
      obj-$(CONFIG_SND_SOC_RT5640)      += snd-soc-rt5640.o
      obj-$(CONFIG_SND_SOC_RT5645)      += snd-soc-rt5645.o

diff --cc sound/soc/codecs/rt5659.c
Simple merge