Merge remote-tracking branches 'asoc/topic/rt5640', 'asoc/topic/rt5645', 'asoc/topic...

diff --cc include/sound/soc.h
Simple merge

diff --cc sound/soc/codecs/Kconfig
index 99e0bdcb3290dce88314af74d8e50abc15be7564,f0e8401378873721f0e69e7fe338fe00afe29fb5,d29f19b446384f7d380668983e25d92e8418d1ba,deba71bad6e9c728a8ab9dce6046a2bd1ebe5312,f0e8401378873721f0e69e7fe338fe00afe29fb5,f0e8401378873721f0e69e7fe338fe00afe29fb5,f0e8401378873721f0e69e7fe338fe00afe29fb5,f0e8401378873721f0e69e7fe338fe00afe29fb5,f0e8401378873721f0e69e7fe338fe00afe29fb5..f1ef578229a34455840ad7c5a45663d7096a262d
--- 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
--- 7/sound/soc/codecs/Kconfig
--- 8/sound/soc/codecs/Kconfig
--- 9/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@@@@@@@@@ -76,6 -71,6 -71,8 -71,7 -71,6 -71,6 -71,6 -71,6 -71,6 +76,8 @@@@@@@@@@ config SND_SOC_ALL_CODEC
                select SND_SOC_PCM512x_SPI if SPI_MASTER
                select SND_SOC_RT5631 if I2C
                select SND_SOC_RT5640 if I2C
++ ++++++       select SND_SOC_RT5645 if I2C
++  +++++       select SND_SOC_RT5651 if I2C
                select SND_SOC_SGTL5000 if I2C
                select SND_SOC_SI476X if MFD_SI476X_CORE
                select SND_SOC_SIRF_AUDIO_CODEC
@@@@@@@@@@ -224,38 -215,9 -217,9 -216,9 -215,9 -215,9 -215,9 -215,9 -215,9 +226,38 @@@@@@@@@@ config SND_SOC_ADAU170
                depends on I2C
                select SND_SOC_SIGMADSP
         
 --------config SND_SOC_ADAU1373
 ++++++++config SND_SOC_ADAU17X1
 ++++++++       tristate
 ++++++++       select SND_SOC_SIGMADSP
 ++++++++
 ++++++++config SND_SOC_ADAU1761
 ++++++++       tristate
 ++++++++       select SND_SOC_ADAU17X1
 ++++++++
 ++++++++config SND_SOC_ADAU1761_I2C
 ++++++++       tristate
 ++++++++       select SND_SOC_ADAU1761
 ++++++++       select REGMAP_I2C
 ++++++++
 ++++++++config SND_SOC_ADAU1761_SPI
 ++++++++       tristate
 ++++++++       select SND_SOC_ADAU1761
 ++++++++       select REGMAP_SPI
 ++++++++
 ++++++++config SND_SOC_ADAU1781
 ++++++++       select SND_SOC_ADAU17X1
 + ++++++       tristate
 + ++++++
 ++++++++config SND_SOC_ADAU1781_I2C
  ++            tristate
 ++++++++       select SND_SOC_ADAU1781
 ++++++++       select REGMAP_I2C
 ++++++++
 ++++++++config SND_SOC_ADAU1781_SPI
 ++ +++++       tristate
 ++++++++       select SND_SOC_ADAU1781
 ++++++++       select REGMAP_SPI
  +      
         config SND_SOC_ADAU1977
                tristate
         
@@@@@@@@@@ -443,6 -396,6 -398,12 -397,9 -396,6 -396,6 -396,6 -396,6 -396,6 +445,12 @@@@@@@@@@ config SND_SOC_RT563
         config SND_SOC_RT5640
                tristate
         
++ ++++++config SND_SOC_RT5645
++ ++++++        tristate
++ ++++++
++  +++++config SND_SOC_RT5651
++  +++++       tristate
++  +++++
         #Freescale sgtl5000 codec
         config SND_SOC_SGTL5000
                tristate "Freescale SGTL5000 CODEC"

diff --cc sound/soc/codecs/Makefile
index f991b067486f47c52b3ee78550f3df10de9d74ef,3c4d275d064bf8cc921c754a2dc577bdf72f4fe8,a3d12b4af1e7fba21f8256013c075c22020fb4bd,e76938ee82f4c65e59653dc19e76b4b42e266a3d,3c4d275d064bf8cc921c754a2dc577bdf72f4fe8,3c4d275d064bf8cc921c754a2dc577bdf72f4fe8,3c4d275d064bf8cc921c754a2dc577bdf72f4fe8,3c4d275d064bf8cc921c754a2dc577bdf72f4fe8,3c4d275d064bf8cc921c754a2dc577bdf72f4fe8..bed0d984c97ce79a5bb9c7b989e58be650153590
--- 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
--- 7/sound/soc/codecs/Makefile
--- 8/sound/soc/codecs/Makefile
--- 9/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@@@@@@@@@ -69,6 -60,6 -60,8 -60,7 -60,6 -60,6 -60,6 -60,6 -60,6 +69,8 @@@@@@@@@@ snd-soc-pcm512x-i2c-objs := pcm512x-i2c
         snd-soc-pcm512x-spi-objs := pcm512x-spi.o
         snd-soc-rt5631-objs := rt5631.o
         snd-soc-rt5640-objs := rt5640.o
++ ++++++snd-soc-rt5645-objs := rt5645.o
++  +++++snd-soc-rt5651-objs := rt5651.o
         snd-soc-sgtl5000-objs := sgtl5000.o
         snd-soc-alc5623-objs := alc5623.o
         snd-soc-alc5632-objs := alc5632.o
@@@@@@@@@@ -230,6 -211,6 -213,8 -212,7 -211,6 -211,6 -211,6 -211,6 -211,6 +232,8 @@@@@@@@@@ obj-$(CONFIG_SND_SOC_PCM512x_I2C)   += sn
         obj-$(CONFIG_SND_SOC_PCM512x_SPI)      += snd-soc-pcm512x-spi.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
++  +++++obj-$(CONFIG_SND_SOC_RT5651)   += snd-soc-rt5651.o
         obj-$(CONFIG_SND_SOC_SGTL5000)  += snd-soc-sgtl5000.o
         obj-$(CONFIG_SND_SOC_SIGMADSP) += snd-soc-sigmadsp.o
         obj-$(CONFIG_SND_SOC_SI476X)   += snd-soc-si476x.o

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

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

diff --cc sound/soc/samsung/Kconfig
Simple merge

diff --cc sound/soc/samsung/smdk_wm8994.c
Simple merge

diff --cc sound/soc/soc-core.c
Simple merge