Merge remote-tracking branches 'asoc/topic/max98504', 'asoc/topic/max9867', 'asoc...

diff --combined sound/soc/codecs/Kconfig
index 7f516b6,b141d78,4d82a58,4d82a58,4d82a58,4d82a58..867d7f9
--- 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
@@@@@@@ -32,7 -32,6 -32,6 -32,6 -32,6 -32,6 +32,7 @@@@@@@ config SND_SOC_ALL_CODEC
        select SND_SOC_ADAU1977_SPI if SPI_MASTER
        select SND_SOC_ADAU1977_I2C if I2C
        select SND_SOC_ADAU1701 if I2C
 +++++  select SND_SOC_ADAU7002
        select SND_SOC_ADS117X
        select SND_SOC_AK4104 if SPI_MASTER
        select SND_SOC_AK4535 if I2C
@@@@@@@ -47,7 -46,6 -46,6 -46,6 -46,6 -46,6 +47,7 @@@@@@@
        select SND_SOC_BT_SCO
        select SND_SOC_CQ0093VC if MFD_DAVINCI_VOICECODEC
        select SND_SOC_CS35L32 if I2C
 +++++  select SND_SOC_CS35L33 if I2C
        select SND_SOC_CS42L51_I2C if I2C
        select SND_SOC_CS42L52 if I2C && INPUT
        select SND_SOC_CS42L56 if I2C && INPUT
@@@@@@@ -59,7 -57,6 -57,6 -57,6 -57,6 -57,6 +59,7 @@@@@@@
        select SND_SOC_CS42XX8_I2C if I2C
        select SND_SOC_CS4349 if I2C
        select SND_SOC_CS47L24 if MFD_CS47L24
 +++++  select SND_SOC_CS53L30 if I2C
        select SND_SOC_CX20442 if TTY
        select SND_SOC_DA7210 if SND_SOC_I2C_AND_SPI
        select SND_SOC_DA7213 if I2C
@@@@@@@ -87,7 -84,6 -84,6 -84,6 -84,6 -84,6 +87,7 @@@@@@@
        select SND_SOC_MAX98925 if I2C
        select SND_SOC_MAX98926 if I2C
        select SND_SOC_MAX9850 if I2C
 +++++  select SND_SOC_MAX9860 if I2C
        select SND_SOC_MAX9768 if I2C
        select SND_SOC_MAX9877 if I2C
        select SND_SOC_MC13783 if MFD_MC13XXX
@@@@@@@ -273,12 -269,8 -269,8 -269,8 -269,8 -269,8 +273,12 @@@@@@@ config SND_SOC_AD198
      config SND_SOC_AD73311
        tristate
      
 +++++config SND_SOC_ADAU_UTILS
 +++++  tristate
 +++++
      config SND_SOC_ADAU1373
        tristate
 +++++  select SND_SOC_ADAU_UTILS
      
      config SND_SOC_ADAU1701
        tristate "Analog Devices ADAU1701 CODEC"
@@@@@@@ -288,7 -280,6 -280,6 -280,6 -280,6 -280,6 +288,7 @@@@@@@
      config SND_SOC_ADAU17X1
        tristate
        select SND_SOC_SIGMADSP_REGMAP
 +++++  select SND_SOC_ADAU_UTILS
      
      config SND_SOC_ADAU1761
        tristate
@@@@@@@ -331,9 -322,6 -322,6 -322,6 -322,6 -322,6 +331,9 @@@@@@@ config SND_SOC_ADAU1977_I2
        select SND_SOC_ADAU1977
        select REGMAP_I2C
      
 +++++config SND_SOC_ADAU7002
 +++++  tristate "Analog Devices ADAU7002 Stereo PDM-to-I2S/TDM Converter"
 +++++
      config SND_SOC_ADAV80X
        tristate
      
@@@@@@@ -383,7 -371,7 -371,7 -371,7 -371,7 -371,7 +383,7 @@@@@@@ config SND_SOC_ALC563
        tristate
      
      config SND_SOC_BT_SCO
 -----  tristate
 +++++  tristate "Dummy BT SCO codec driver"
      
      config SND_SOC_CQ0093VC
        tristate
@@@@@@@ -392,10 -380,6 -380,6 -380,6 -380,6 -380,6 +392,10 @@@@@@@ config SND_SOC_CS35L3
        tristate "Cirrus Logic CS35L32 CODEC"
        depends on I2C
      
 +++++config SND_SOC_CS35L33
 +++++  tristate "Cirrus Logic CS35L33 CODEC"
 +++++  depends on I2C
 +++++
      config SND_SOC_CS42L51
        tristate
      
@@@@@@@ -466,11 -450,6 -450,6 -450,6 -450,6 -450,6 +466,11 @@@@@@@ config SND_SOC_CS434
      config SND_SOC_CS47L24
        tristate
      
 +++++# Cirrus Logic Quad-Channel ADC
 +++++config SND_SOC_CS53L30
 +++++  tristate "Cirrus Logic CS53L30 CODEC"
 +++++  depends on I2C
 +++++
      config SND_SOC_CX20442
        tristate
        depends on TTY
@@@@@@@ -504,10 -483,9 -483,9 -483,9 -483,9 -483,9 +504,10 @@@@@@@ config SND_SOC_DMI
        tristate
      
      config SND_SOC_HDMI_CODEC
 -----       tristate
 -----       select SND_PCM_ELD
 -----       select SND_PCM_IEC958
 +++++  tristate
 +++++  select SND_PCM_ELD
 +++++  select SND_PCM_IEC958
 +++++  select HDMI
      
      config SND_SOC_ES8328
        tristate "Everest Semi ES8328 CODEC"
@@@@@@@ -557,6 -535,10 -535,6 -535,6 -535,6 -535,6 +557,10 @@@@@@@ config SND_SOC_MAX98357
      config SND_SOC_MAX98371
             tristate
      
+ ++++config SND_SOC_MAX98504
+ ++++  tristate "Maxim MAX98504 speaker amplifier"
+ ++++  depends on I2C
+ ++++
      config SND_SOC_MAX9867
        tristate
      
@@@@@@@ -569,11 -551,6 -547,6 -547,6 -547,6 -547,6 +573,11 @@@@@@@ config SND_SOC_MAX9892
      config SND_SOC_MAX9850
        tristate
      
 +++++config SND_SOC_MAX9860
 +++++  tristate "Maxim MAX9860 Mono Audio Voice Codec"
 +++++  depends on I2C
 +++++  select REGMAP_I2C
 +++++
      config SND_SOC_PCM1681
        tristate "Texas Instruments PCM1681 CODEC"
        depends on I2C

diff --combined sound/soc/codecs/Makefile
index ff97d73,fd8c477,0f548fd,0f548fd,0f548fd,0f548fd..a117312
--- 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
@@@@@@@ -7,7 -7,6 -7,6 -7,6 -7,6 -7,6 +7,7 @@@@@@@ snd-soc-ad193x-spi-objs := ad193x-spi.
      snd-soc-ad193x-i2c-objs := ad193x-i2c.o
      snd-soc-ad1980-objs := ad1980.o
      snd-soc-ad73311-objs := ad73311.o
 +++++snd-soc-adau-utils-objs := adau-utils.o
      snd-soc-adau1373-objs := adau1373.o
      snd-soc-adau1701-objs := adau1701.o
      snd-soc-adau17x1-objs := adau17x1.o
@@@@@@@ -20,7 -19,6 -19,6 -19,6 -19,6 -19,6 +20,7 @@@@@@@ snd-soc-adau1781-spi-objs := adau1781-s
      snd-soc-adau1977-objs := adau1977.o
      snd-soc-adau1977-spi-objs := adau1977-spi.o
      snd-soc-adau1977-i2c-objs := adau1977-i2c.o
 +++++snd-soc-adau7002-objs := adau7002.o
      snd-soc-adav80x-objs := adav80x.o
      snd-soc-adav801-objs := adav801.o
      snd-soc-adav803-objs := adav803.o
@@@@@@@ -37,7 -35,6 -35,6 -35,6 -35,6 -35,6 +37,7 @@@@@@@ snd-soc-arizona-objs := arizona.
      snd-soc-bt-sco-objs := bt-sco.o
      snd-soc-cq93vc-objs := cq93vc.o
      snd-soc-cs35l32-objs := cs35l32.o
 +++++snd-soc-cs35l33-objs := cs35l33.o
      snd-soc-cs42l51-objs := cs42l51.o
      snd-soc-cs42l51-i2c-objs := cs42l51-i2c.o
      snd-soc-cs42l52-objs := cs42l52.o
@@@@@@@ -52,7 -49,6 -49,6 -49,6 -49,6 -49,6 +52,7 @@@@@@@ snd-soc-cs42xx8-objs := cs42xx8.
      snd-soc-cs42xx8-i2c-objs := cs42xx8-i2c.o
      snd-soc-cs4349-objs := cs4349.o
      snd-soc-cs47l24-objs := cs47l24.o
 +++++snd-soc-cs53l30-objs := cs53l30.o
      snd-soc-cx20442-objs := cx20442.o
      snd-soc-da7210-objs := da7210.o
      snd-soc-da7213-objs := da7213.o
@@@@@@@ -83,7 -79,6 -79,6 -79,6 -79,6 -79,6 +83,7 @@@@@@@ snd-soc-max9867-objs := max9867.
      snd-soc-max98925-objs := max98925.o
      snd-soc-max98926-objs := max98926.o
      snd-soc-max9850-objs := max9850.o
 +++++snd-soc-max9860-objs := max9860.o
      snd-soc-mc13783-objs := mc13783.o
      snd-soc-ml26124-objs := ml26124.o
      snd-soc-nau8825-objs := nau8825.o
@@@@@@@ -213,6 -208,7 -208,6 -208,6 -208,6 -208,6 +213,7 @@@@@@@ snd-soc-wm-hubs-objs := wm_hubs.
      
      # Amp
      snd-soc-max9877-objs := max9877.o
+ ++++snd-soc-max98504-objs := max98504.o
      snd-soc-tpa6130a2-objs := tpa6130a2.o
      snd-soc-tas2552-objs := tas2552.o
      
@@@@@@@ -225,7 -221,6 -220,6 -220,6 -220,6 -220,6 +226,7 @@@@@@@ obj-$(CONFIG_SND_SOC_AD193X_SPI)       += snd
      obj-$(CONFIG_SND_SOC_AD193X_I2C)  += snd-soc-ad193x-i2c.o
      obj-$(CONFIG_SND_SOC_AD1980)      += snd-soc-ad1980.o
      obj-$(CONFIG_SND_SOC_AD73311) += snd-soc-ad73311.o
 +++++obj-$(CONFIG_SND_SOC_ADAU_UTILS)  += snd-soc-adau-utils.o
      obj-$(CONFIG_SND_SOC_ADAU1373)    += snd-soc-adau1373.o
      obj-$(CONFIG_SND_SOC_ADAU1701)            += snd-soc-adau1701.o
      obj-$(CONFIG_SND_SOC_ADAU17X1)            += snd-soc-adau17x1.o
@@@@@@@ -238,7 -233,6 -232,6 -232,6 -232,6 -232,6 +239,7 @@@@@@@ obj-$(CONFIG_SND_SOC_ADAU1781_SPI)     += s
      obj-$(CONFIG_SND_SOC_ADAU1977)            += snd-soc-adau1977.o
      obj-$(CONFIG_SND_SOC_ADAU1977_SPI)        += snd-soc-adau1977-spi.o
      obj-$(CONFIG_SND_SOC_ADAU1977_I2C)        += snd-soc-adau1977-i2c.o
 +++++obj-$(CONFIG_SND_SOC_ADAU7002)    += snd-soc-adau7002.o
      obj-$(CONFIG_SND_SOC_ADAV80X)  += snd-soc-adav80x.o
      obj-$(CONFIG_SND_SOC_ADAV801)  += snd-soc-adav801.o
      obj-$(CONFIG_SND_SOC_ADAV803)  += snd-soc-adav803.o
@@@@@@@ -257,7 -251,6 -250,6 -250,6 -250,6 -250,6 +258,7 @@@@@@@ obj-$(CONFIG_SND_SOC_ARIZONA)  += snd-so
      obj-$(CONFIG_SND_SOC_BT_SCO)      += snd-soc-bt-sco.o
      obj-$(CONFIG_SND_SOC_CQ0093VC) += snd-soc-cq93vc.o
      obj-$(CONFIG_SND_SOC_CS35L32)     += snd-soc-cs35l32.o
 +++++obj-$(CONFIG_SND_SOC_CS35L33)     += snd-soc-cs35l33.o
      obj-$(CONFIG_SND_SOC_CS42L51)     += snd-soc-cs42l51.o
      obj-$(CONFIG_SND_SOC_CS42L51_I2C) += snd-soc-cs42l51-i2c.o
      obj-$(CONFIG_SND_SOC_CS42L52)     += snd-soc-cs42l52.o
@@@@@@@ -272,7 -265,6 -264,6 -264,6 -264,6 -264,6 +273,7 @@@@@@@ obj-$(CONFIG_SND_SOC_CS42XX8)  += snd-so
      obj-$(CONFIG_SND_SOC_CS42XX8_I2C) += snd-soc-cs42xx8-i2c.o
      obj-$(CONFIG_SND_SOC_CS4349)      += snd-soc-cs4349.o
      obj-$(CONFIG_SND_SOC_CS47L24)     += snd-soc-cs47l24.o
 +++++obj-$(CONFIG_SND_SOC_CS53L30)     += snd-soc-cs53l30.o
      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
@@@@@@@ -302,7 -294,6 -293,6 -293,6 -293,6 -293,6 +303,7 @@@@@@@ obj-$(CONFIG_SND_SOC_MAX9867)  += snd-so
      obj-$(CONFIG_SND_SOC_MAX98925)    += snd-soc-max98925.o
      obj-$(CONFIG_SND_SOC_MAX98926)    += snd-soc-max98926.o
      obj-$(CONFIG_SND_SOC_MAX9850)     += snd-soc-max9850.o
 +++++obj-$(CONFIG_SND_SOC_MAX9860)     += snd-soc-max9860.o
      obj-$(CONFIG_SND_SOC_MC13783)     += snd-soc-mc13783.o
      obj-$(CONFIG_SND_SOC_ML26124)     += snd-soc-ml26124.o
      obj-$(CONFIG_SND_SOC_NAU8825)   += snd-soc-nau8825.o
@@@@@@@ -429,4 -420,5 -419,4 -419,4 -419,4 -419,4 +430,5 @@@@@@@ obj-$(CONFIG_SND_SOC_WM_HUBS)  += snd-so
      
      # Amp
      obj-$(CONFIG_SND_SOC_MAX9877)     += snd-soc-max9877.o
+ ++++obj-$(CONFIG_SND_SOC_MAX98504)    += snd-soc-max98504.o
      obj-$(CONFIG_SND_SOC_TPA6130A2)   += snd-soc-tpa6130a2.o