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

diff --cc sound/soc/codecs/Kconfig
index c691e22,04c87f7..0615e00
--- 1/sound/soc/codecs/Kconfig
--- 2/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@@ -53,9 -53,10 +53,10 @@@ config SND_SOC_ALL_CODEC
        select SND_SOC_MAX9877 if I2C
        select SND_SOC_MC13783 if MFD_MC13XXX
        select SND_SOC_ML26124 if I2C
 -      select SND_SOC_OMAP_HDMI_CODEC if OMAP4_DSS_HDMI
 +      select SND_SOC_HDMI_CODEC
        select SND_SOC_PCM3008
        select SND_SOC_RT5631 if I2C
+       select SND_SOC_RT5640 if I2C
        select SND_SOC_SGTL5000 if I2C
        select SND_SOC_SI476X if MFD_SI476X_CORE
        select SND_SOC_SN95031 if INTEL_SCU_IPC

diff --cc sound/soc/codecs/Makefile
index 82aa34e,732c4a7..93b3e22
--- 1/sound/soc/codecs/Makefile
--- 2/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@@ -41,9 -41,10 +41,10 @@@ snd-soc-max98095-objs := max98095.
  snd-soc-max9850-objs := max9850.o
  snd-soc-mc13783-objs := mc13783.o
  snd-soc-ml26124-objs := ml26124.o
 -snd-soc-omap-hdmi-codec-objs := omap-hdmi.o
 +snd-soc-hdmi-codec-objs := hdmi.o
  snd-soc-pcm3008-objs := pcm3008.o
  snd-soc-rt5631-objs := rt5631.o
+ snd-soc-rt5640-objs := rt5640.o
  snd-soc-sgtl5000-objs := sgtl5000.o
  snd-soc-alc5623-objs := alc5623.o
  snd-soc-alc5632-objs := alc5632.o
@@@ -168,9 -169,10 +169,10 @@@ obj-$(CONFIG_SND_SOC_MAX98095)   += snd-s
  obj-$(CONFIG_SND_SOC_MAX9850) += snd-soc-max9850.o
  obj-$(CONFIG_SND_SOC_MC13783) += snd-soc-mc13783.o
  obj-$(CONFIG_SND_SOC_ML26124) += snd-soc-ml26124.o
 -obj-$(CONFIG_SND_SOC_OMAP_HDMI_CODEC) += snd-soc-omap-hdmi-codec.o
 +obj-$(CONFIG_SND_SOC_HDMI_CODEC) += snd-soc-hdmi-codec.o
  obj-$(CONFIG_SND_SOC_PCM3008) += snd-soc-pcm3008.o
  obj-$(CONFIG_SND_SOC_RT5631)  += snd-soc-rt5631.o
+ obj-$(CONFIG_SND_SOC_RT5640)  += snd-soc-rt5640.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