Merge remote-tracking branches 'asoc/topic/ad193x' and 'asoc/topic/arizona' into...

diff --combined sound/soc/codecs/Kconfig
index 70e5a75901aa20fbde390478e60de4c01ab3df2f,0c9733ecd17f29a040ec3f2a4c7dfab8c59007e7,6c30bade64b6b3cbe3cd8f73e2e78d29557ad484..b77c6b06c87fb9e337157f932965fdc993544e0c
--- 1/sound/soc/codecs/Kconfig
--- 2/sound/soc/codecs/Kconfig
--- 3/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@@@ -36,7 -36,6 -36,6 +36,7 @@@@ config SND_SOC_ALL_CODEC
        select SND_SOC_AK4104 if SPI_MASTER
        select SND_SOC_AK4535 if I2C
        select SND_SOC_AK4554
 ++     select SND_SOC_AK4613 if I2C
        select SND_SOC_AK4641 if I2C
        select SND_SOC_AK4642 if I2C
        select SND_SOC_AK4671 if I2C
@@@@ -80,6 -79,7 -79,7 +80,6 @@@@
        select SND_SOC_MAX9877 if I2C
        select SND_SOC_MC13783 if MFD_MC13XXX
        select SND_SOC_ML26124 if I2C
 --     select SND_SOC_HDMI_CODEC
        select SND_SOC_PCM1681 if I2C
        select SND_SOC_PCM1792A if SPI_MASTER
        select SND_SOC_PCM3008
@@@@ -171,6 -171,6 -171,7 +171,7 @@@@
        select SND_SOC_WM8995 if SND_SOC_I2C_AND_SPI
        select SND_SOC_WM8996 if I2C
        select SND_SOC_WM8997 if MFD_WM8997
++      select SND_SOC_WM8998 if MFD_WM8998
        select SND_SOC_WM9081 if I2C
        select SND_SOC_WM9090 if I2C
        select SND_SOC_WM9705 if SND_SOC_AC97_BUS
@@@@ -195,9 -195,9 -196,11 +196,11 @@@@ config SND_SOC_ARIZON
        default y if SND_SOC_WM5102=y
        default y if SND_SOC_WM5110=y
        default y if SND_SOC_WM8997=y
++      default y if SND_SOC_WM8998=y
        default m if SND_SOC_WM5102=m
        default m if SND_SOC_WM5110=m
        default m if SND_SOC_WM8997=m
++      default m if SND_SOC_WM8998=m
   
   config SND_SOC_WM_HUBS
        tristate
@@@@ -319,10 -319,6 -322,6 +322,10 @@@@ config SND_SOC_AK453
   config SND_SOC_AK4554
        tristate "AKM AK4554 CODEC"
   
 ++config SND_SOC_AK4613
 ++     tristate "AKM AK4613 CODEC"
 ++     depends on I2C
 ++
   config SND_SOC_AK4641
        tristate
   
@@@@ -446,6 -442,9 -445,9 +449,6 @@@@ config SND_SOC_BT_SC
   config SND_SOC_DMIC
        tristate
   
 --config SND_SOC_HDMI_CODEC
 --       tristate "HDMI stub CODEC"
 --
   config SND_SOC_ES8328
        tristate "Everest Semi ES8328 CODEC"
   
@@@@ -866,6 -865,6 -868,9 +869,9 @@@@ config SND_SOC_WM899
   config SND_SOC_WM8997
        tristate
   
++ config SND_SOC_WM8998
++      tristate
++ 
   config SND_SOC_WM9081
        tristate
   

diff --combined sound/soc/codecs/Makefile
index be1491acb6aea0aeff3df80e7f039d36eef295c4,4a32077954aee6aee2966ced2573991d1673b02a,a9d47693aa56fde34ae3648a73e37576712ed7f0..8d0f9d8bd9fe5ea5f319a5541c30812ca2f84cb9
--- 1/sound/soc/codecs/Makefile
--- 2/sound/soc/codecs/Makefile
--- 3/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@@@ -26,7 -26,6 -26,6 +26,7 @@@@ snd-soc-ads117x-objs := ads117x.
   snd-soc-ak4104-objs := ak4104.o
   snd-soc-ak4535-objs := ak4535.o
   snd-soc-ak4554-objs := ak4554.o
 ++snd-soc-ak4613-objs := ak4613.o
   snd-soc-ak4641-objs := ak4641.o
   snd-soc-ak4642-objs := ak4642.o
   snd-soc-ak4671-objs := ak4671.o
@@@@ -73,6 -72,7 -72,7 +73,6 @@@@ snd-soc-max98925-objs := max98925.
   snd-soc-max9850-objs := max9850.o
   snd-soc-mc13783-objs := mc13783.o
   snd-soc-ml26124-objs := ml26124.o
 --snd-soc-hdmi-codec-objs := hdmi.o
   snd-soc-pcm1681-objs := pcm1681.o
   snd-soc-pcm1792a-codec-objs := pcm1792a.o
   snd-soc-pcm3008-objs := pcm3008.o
@@@@ -176,6 -176,6 -176,7 +176,7 @@@@ snd-soc-wm8993-objs := wm8993.
   snd-soc-wm8994-objs := wm8994.o wm8958-dsp2.o
   snd-soc-wm8995-objs := wm8995.o
   snd-soc-wm8997-objs := wm8997.o
++ snd-soc-wm8998-objs := wm8998.o
   snd-soc-wm9081-objs := wm9081.o
   snd-soc-wm9090-objs := wm9090.o
   snd-soc-wm9705-objs := wm9705.o
@@@@ -216,7 -216,6 -217,6 +217,7 @@@@ obj-$(CONFIG_SND_SOC_ADS117X)     += snd-so
   obj-$(CONFIG_SND_SOC_AK4104) += snd-soc-ak4104.o
   obj-$(CONFIG_SND_SOC_AK4535) += snd-soc-ak4535.o
   obj-$(CONFIG_SND_SOC_AK4554) += snd-soc-ak4554.o
 ++obj-$(CONFIG_SND_SOC_AK4613) += snd-soc-ak4613.o
   obj-$(CONFIG_SND_SOC_AK4641) += snd-soc-ak4641.o
   obj-$(CONFIG_SND_SOC_AK4642) += snd-soc-ak4642.o
   obj-$(CONFIG_SND_SOC_AK4671) += snd-soc-ak4671.o
@@@@ -265,6 -264,7 -265,7 +266,6 @@@@ obj-$(CONFIG_SND_SOC_MAX98925)    += 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_HDMI_CODEC) += snd-soc-hdmi-codec.o
   obj-$(CONFIG_SND_SOC_PCM1681)        += snd-soc-pcm1681.o
   obj-$(CONFIG_SND_SOC_PCM1792A)       += snd-soc-pcm1792a-codec.o
   obj-$(CONFIG_SND_SOC_PCM3008)        += snd-soc-pcm3008.o
@@@@ -364,6 -364,6 -365,7 +365,7 @@@@ obj-$(CONFIG_SND_SOC_WM8993)      += snd-soc
   obj-$(CONFIG_SND_SOC_WM8994) += snd-soc-wm8994.o
   obj-$(CONFIG_SND_SOC_WM8995) += snd-soc-wm8995.o
   obj-$(CONFIG_SND_SOC_WM8997) += snd-soc-wm8997.o
++ obj-$(CONFIG_SND_SOC_WM8998) += snd-soc-wm8998.o
   obj-$(CONFIG_SND_SOC_WM9081) += snd-soc-wm9081.o
   obj-$(CONFIG_SND_SOC_WM9090) += snd-soc-wm9090.o
   obj-$(CONFIG_SND_SOC_WM9705) += snd-soc-wm9705.o