Merge remote-tracking branches 'asoc/topic/nau8825' and 'asoc/topic/pxa' into asoc...

diff --combined sound/soc/codecs/Kconfig
index cce4e96,cc60ab9,0c9733e..cfdafc4
--- 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
@@@@ -58,7 -57,6 -57,6 +58,7 @@@@
        select SND_SOC_CX20442 if TTY
        select SND_SOC_DA7210 if SND_SOC_I2C_AND_SPI
        select SND_SOC_DA7213 if I2C
 ++     select SND_SOC_DA7219 if I2C
        select SND_SOC_DA732X if I2C
        select SND_SOC_DA9055 if I2C
        select SND_SOC_DMIC
@@@@ -81,6 -79,7 -79,7 +81,7 @@@@
        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_NAU8825 if I2C
        select SND_SOC_PCM1681 if I2C
        select SND_SOC_PCM1792A if SPI_MASTER
        select SND_SOC_PCM3008
@@@@ -172,7 -171,6 -171,6 +173,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
@@@@ -197,11 -195,9 -195,9 +198,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
@@@@ -323,10 -319,6 -319,6 +324,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
   
@@@@ -438,9 -430,6 -430,6 +439,9 @@@@ config SND_SOC_DA721
   config SND_SOC_DA7213
           tristate
   
 ++config SND_SOC_DA7219
 ++        tristate
 ++
   config SND_SOC_DA732X
           tristate
   
@@@@ -453,6 -442,6 -442,9 +454,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"
   
@@@@ -873,9 -862,6 -865,6 +874,9 @@@@ config SND_SOC_WM899
   config SND_SOC_WM8997
        tristate
   
 ++config SND_SOC_WM8998
 ++     tristate
 ++
   config SND_SOC_WM9081
        tristate
   
@@@@ -907,6 -893,9 -896,6 +908,9 @@@@ config SND_SOC_MC1378
   config SND_SOC_ML26124
        tristate
   
+ +config SND_SOC_NAU8825
+ +     tristate
+ +
   config SND_SOC_TPA6130A2
        tristate "Texas Instruments TPA6130A2 headphone amplifier"
        depends on I2C

diff --combined sound/soc/codecs/Makefile
index 783300a,d7b0f41,4a32077..f632fc4
--- 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
@@@@ -50,7 -49,6 -49,6 +50,7 @@@@ snd-soc-cs4349-objs := cs4349.
   snd-soc-cx20442-objs := cx20442.o
   snd-soc-da7210-objs := da7210.o
   snd-soc-da7213-objs := da7213.o
 ++snd-soc-da7219-objs := da7219.o da7219-aad.o
   snd-soc-da732x-objs := da732x.o
   snd-soc-da9055-objs := da9055.o
   snd-soc-bt-sco-objs := bt-sco.o
@@@@ -74,6 -72,7 -72,7 +74,7 @@@@ 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-nau8825-objs := nau8825.o
   snd-soc-pcm1681-objs := pcm1681.o
   snd-soc-pcm1792a-codec-objs := pcm1792a.o
   snd-soc-pcm3008-objs := pcm3008.o
@@@@ -177,7 -176,6 -176,6 +178,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
@@@@ -218,7 -216,6 -216,6 +219,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
@@@@ -244,7 -241,6 -241,6 +245,7 @@@@ obj-$(CONFIG_SND_SOC_CS4349)      += snd-soc
   obj-$(CONFIG_SND_SOC_CX20442)        += snd-soc-cx20442.o
   obj-$(CONFIG_SND_SOC_DA7210) += snd-soc-da7210.o
   obj-$(CONFIG_SND_SOC_DA7213) += snd-soc-da7213.o
 ++obj-$(CONFIG_SND_SOC_DA7219) += snd-soc-da7219.o
   obj-$(CONFIG_SND_SOC_DA732X) += snd-soc-da732x.o
   obj-$(CONFIG_SND_SOC_DA9055) += snd-soc-da9055.o
   obj-$(CONFIG_SND_SOC_BT_SCO) += snd-soc-bt-sco.o
@@@@ -268,6 -264,7 -264,7 +269,7 @@@@ 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_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_PCM3008)        += snd-soc-pcm3008.o
@@@@ -367,7 -364,6 -364,6 +369,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