Merge remote-tracking branches 'asoc/topic/es7134', 'asoc/topic/es8328', 'asoc/topic...

diff --combined sound/soc/codecs/Kconfig
index e3e6f39d14e86f08828c4ad6c4edbd25535447ea,7c7c2e96b83659b9d22f571c25c1dc11ad41a446,e49e9da7f1f6e41028a0ca832e76e7dce0bc1c01,e49e9da7f1f6e41028a0ca832e76e7dce0bc1c01,9e1718a8cb1ce20a0fd68e2cbe797653b39aadeb,9e1718a8cb1ce20a0fd68e2cbe797653b39aadeb..70decab5e9855e91b85b65ee7559a53f55d01a84
--- 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
@@@@@@@ -45,11 -45,10 -45,10 -45,10 -45,10 -45,10 +45,11 @@@@@@@ config SND_SOC_ALL_CODEC
        select SND_SOC_ALC5623 if I2C
        select SND_SOC_ALC5632 if I2C
        select SND_SOC_BT_SCO
    --  select SND_SOC_CQ0093VC if MFD_DAVINCI_VOICECODEC
    ++  select SND_SOC_CQ0093VC
        select SND_SOC_CS35L32 if I2C
        select SND_SOC_CS35L33 if I2C
        select SND_SOC_CS35L34 if I2C
 +++++  select SND_SOC_CS35L35 if I2C
        select SND_SOC_CS42L42 if I2C
        select SND_SOC_CS42L51_I2C if I2C
        select SND_SOC_CS42L52 if I2C && INPUT
@@@@@@@ -70,10 -69,10 -69,9 -69,9 -69,9 -69,9 +70,11 @@@@@@@
        select SND_SOC_DA7219 if I2C
        select SND_SOC_DA732X if I2C
        select SND_SOC_DA9055 if I2C
 +++++  select SND_SOC_DIO2125
        select SND_SOC_DMIC
        select SND_SOC_ES8328_SPI if SPI_MASTER
        select SND_SOC_ES8328_I2C if I2C
+ ++++  select SND_SOC_ES7134
        select SND_SOC_GTM601
        select SND_SOC_HDAC_HDMI
        select SND_SOC_ICS43432
@@@@@@@ -97,7 -96,7 -95,7 -95,7 -95,6 -95,6 +98,7 @@@@@@@
        select SND_SOC_MAX9877 if I2C
        select SND_SOC_MC13783 if MFD_MC13XXX
        select SND_SOC_ML26124 if I2C
    ++  select SND_SOC_NAU8540 if I2C
        select SND_SOC_NAU8810 if I2C
        select SND_SOC_NAU8825 if I2C
        select SND_SOC_HDMI_CODEC
@@@@@@@ -120,8 -119,8 -118,8 -118,8 -117,8 -117,8 +121,8 @@@@@@@
        select SND_SOC_RT5651 if I2C
        select SND_SOC_RT5659 if I2C
        select SND_SOC_RT5660 if I2C
    --  select SND_SOC_RT5665 if I2C
        select SND_SOC_RT5663 if I2C
    ++  select SND_SOC_RT5665 if I2C
        select SND_SOC_RT5670 if I2C
        select SND_SOC_RT5677 if I2C && SPI_MASTER
        select SND_SOC_SGTL5000 if I2C
@@@@@@@ -305,14 -304,12 -303,12 -303,12 -302,12 -302,12 +306,14 @@@@@@@ config SND_SOC_ADAU176
        select SND_SOC_ADAU17X1
      
      config SND_SOC_ADAU1761_I2C
 -----  tristate
 +++++  tristate "Analog Devices AU1761 CODEC - I2C"
 +++++  depends on I2C
        select SND_SOC_ADAU1761
        select REGMAP_I2C
      
      config SND_SOC_ADAU1761_SPI
 -----  tristate
 +++++  tristate "Analog Devices AU1761 CODEC - SPI"
 +++++  depends on SPI
        select SND_SOC_ADAU1761
        select REGMAP_SPI
      
@@@@@@@ -412,10 -409,6 -408,6 -408,6 -407,6 -407,6 +413,10 @@@@@@@ config SND_SOC_CS35L3
        tristate "Cirrus Logic CS35L34 CODEC"
        depends on I2C
      
 +++++config SND_SOC_CS35L35
 +++++  tristate "Cirrus Logic CS35L35 CODEC"
 +++++  depends on I2C
 +++++
      config SND_SOC_CS42L42
        tristate "Cirrus Logic CS42L42 CODEC"
        depends on I2C
@@@@@@@ -524,10 -517,6 -516,6 -516,6 -515,6 -515,6 +525,10 @@@@@@@ config SND_SOC_DA732
      config SND_SOC_DA9055
        tristate
      
 +++++config SND_SOC_DIO2125
 +++++  tristate "Dioo DIO2125 Amplifier"
 +++++  select GPIOLIB
 +++++
      config SND_SOC_DMIC
        tristate
      
@@@@@@@ -537,17 -526,20 -525,17 -525,17 -524,15 -524,15 +538,20 @@@@@@@ config SND_SOC_HDMI_CODE
        select SND_PCM_IEC958
        select HDMI
      
+ ++++config SND_SOC_ES7134
+ ++++       tristate "Everest Semi ES7134 CODEC"
+ ++++
      config SND_SOC_ES8328
    --  tristate "Everest Semi ES8328 CODEC"
    ++  tristate
      
      config SND_SOC_ES8328_I2C
    --  tristate
    ++  tristate "Everest Semi ES8328 CODEC (I2C)"
    ++  depends on I2C
        select SND_SOC_ES8328
      
      config SND_SOC_ES8328_SPI
    --  tristate
    ++  tristate "Everest Semi ES8328 CODEC (SPI)"
    ++  depends on SPI_MASTER
        select SND_SOC_ES8328
      
      config SND_SOC_GTM601
@@@@@@@ -683,8 -675,8 -671,8 -671,8 -668,8 -668,8 +687,8 @@@@@@@ config SND_SOC_RL623
        default y if SND_SOC_RT5651=y
        default y if SND_SOC_RT5659=y
        default y if SND_SOC_RT5660=y
    --  default y if SND_SOC_RT5665=y
        default y if SND_SOC_RT5663=y
    ++  default y if SND_SOC_RT5665=y
        default y if SND_SOC_RT5670=y
        default y if SND_SOC_RT5677=y
        default m if SND_SOC_RT5514=m
@@@@@@@ -694,8 -686,8 -682,8 -682,8 -679,8 -679,8 +698,8 @@@@@@@
        default m if SND_SOC_RT5651=m
        default m if SND_SOC_RT5659=m
        default m if SND_SOC_RT5660=m
    --  default m if SND_SOC_RT5665=m
        default m if SND_SOC_RT5663=m
    ++  default m if SND_SOC_RT5665=m
        default m if SND_SOC_RT5670=m
        default m if SND_SOC_RT5677=m
      
@@@@@@@ -743,10 -735,10 -731,10 -731,10 -728,10 -728,10 +747,10 @@@@@@@ config SND_SOC_RT565
      config SND_SOC_RT5660
        tristate
      
    --config SND_SOC_RT5665
    ++config SND_SOC_RT5663
        tristate
      
    --config SND_SOC_RT5663
    ++config SND_SOC_RT5665
        tristate
      
      config SND_SOC_RT5670
@@@@@@@ -1120,10 -1112,10 -1108,10 -1108,10 -1105,6 -1105,6 +1124,10 @@@@@@@ config SND_SOC_MC1378
      config SND_SOC_ML26124
        tristate
      
    ++config SND_SOC_NAU8540
    ++       tristate "Nuvoton Technology Corporation NAU85L40 CODEC"
    ++       depends on I2C
    ++
      config SND_SOC_NAU8810
        tristate "Nuvoton Technology Corporation NAU88C10 CODEC"
        depends on I2C

diff --combined sound/soc/codecs/Makefile
index 2c596d84fa3ec149aa264193838f8c4ad9b64213,b65868c963c9e0646c1f977b7cd700f0a9ccad52,1796cb987e712c78b0fe8f3aa8ec71177256b5b2,1796cb987e712c78b0fe8f3aa8ec71177256b5b2,7e1dad79610b39a6d5b83865c7022f09d53d3705,7e1dad79610b39a6d5b83865c7022f09d53d3705..bbef31ec1f80498e6e6c81b0efa88baaa54db41d
--- 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
@@@@@@@ -39,7 -39,6 -39,6 -39,6 -39,6 -39,6 +39,7 @@@@@@@ snd-soc-cq93vc-objs := cq93vc.
      snd-soc-cs35l32-objs := cs35l32.o
      snd-soc-cs35l33-objs := cs35l33.o
      snd-soc-cs35l34-objs := cs35l34.o
 +++++snd-soc-cs35l35-objs := cs35l35.o
      snd-soc-cs42l42-objs := cs42l42.o
      snd-soc-cs42l51-objs := cs42l51.o
      snd-soc-cs42l51-i2c-objs := cs42l51-i2c.o
@@@@@@@ -64,6 -63,7 -63,6 -63,6 -63,6 -63,6 +64,7 @@@@@@@ snd-soc-da7219-objs := da7219.o da7219-
      snd-soc-da732x-objs := da732x.o
      snd-soc-da9055-objs := da9055.o
      snd-soc-dmic-objs := dmic.o
+ ++++snd-soc-es7134-objs := es7134.o
      snd-soc-es8328-objs := es8328.o
      snd-soc-es8328-i2c-objs := es8328-i2c.o
      snd-soc-es8328-spi-objs := es8328-spi.o
@@@@@@@ -91,7 -91,7 -90,7 -90,7 -90,6 -90,6 +92,7 @@@@@@@ snd-soc-mc13783-objs := mc13783.
      snd-soc-ml26124-objs := ml26124.o
      snd-soc-msm8916-analog-objs := msm8916-wcd-analog.o
      snd-soc-msm8916-digital-objs := msm8916-wcd-digital.o
    ++snd-soc-nau8540-objs := nau8540.o
      snd-soc-nau8810-objs := nau8810.o
      snd-soc-nau8825-objs := nau8825.o
      snd-soc-hdmi-codec-objs := hdmi-codec.o
@@@@@@@ -120,8 -120,8 -119,8 -119,8 -118,8 -118,8 +121,8 @@@@@@@ snd-soc-rt5645-objs := rt5645.
      snd-soc-rt5651-objs := rt5651.o
      snd-soc-rt5659-objs := rt5659.o
      snd-soc-rt5660-objs := rt5660.o
    --snd-soc-rt5665-objs := rt5665.o
      snd-soc-rt5663-objs := rt5663.o
    ++snd-soc-rt5665-objs := rt5665.o
      snd-soc-rt5670-objs := rt5670.o
      snd-soc-rt5677-objs := rt5677.o
      snd-soc-rt5677-spi-objs := rt5677-spi.o
@@@@@@@ -222,7 -222,6 -221,6 -221,6 -220,6 -220,6 +223,7 @@@@@@@ snd-soc-wm9712-objs := wm9712.
      snd-soc-wm9713-objs := wm9713.o
      snd-soc-wm-hubs-objs := wm_hubs.o
      # Amp
 +++++snd-soc-dio2125-objs := dio2125.o
      snd-soc-max9877-objs := max9877.o
      snd-soc-max98504-objs := max98504.o
      snd-soc-tpa6130a2-objs := tpa6130a2.o
@@@@@@@ -271,7 -270,6 -269,6 -269,6 -268,6 -268,6 +272,7 @@@@@@@ obj-$(CONFIG_SND_SOC_CQ0093VC) += snd-s
      obj-$(CONFIG_SND_SOC_CS35L32)     += snd-soc-cs35l32.o
      obj-$(CONFIG_SND_SOC_CS35L33)     += snd-soc-cs35l33.o
      obj-$(CONFIG_SND_SOC_CS35L34)     += snd-soc-cs35l34.o
 +++++obj-$(CONFIG_SND_SOC_CS35L35)     += snd-soc-cs35l35.o
      obj-$(CONFIG_SND_SOC_CS42L42)     += snd-soc-cs42l42.o
      obj-$(CONFIG_SND_SOC_CS42L51)     += snd-soc-cs42l51.o
      obj-$(CONFIG_SND_SOC_CS42L51_I2C) += snd-soc-cs42l51-i2c.o
@@@@@@@ -296,6 -294,7 -293,6 -293,6 -292,6 -292,6 +297,7 @@@@@@@ obj-$(CONFIG_SND_SOC_DA7219)   += snd-soc
      obj-$(CONFIG_SND_SOC_DA732X)      += snd-soc-da732x.o
      obj-$(CONFIG_SND_SOC_DA9055)      += snd-soc-da9055.o
      obj-$(CONFIG_SND_SOC_DMIC)        += snd-soc-dmic.o
+ ++++obj-$(CONFIG_SND_SOC_ES7134)      += snd-soc-es7134.o
      obj-$(CONFIG_SND_SOC_ES8328)      += snd-soc-es8328.o
      obj-$(CONFIG_SND_SOC_ES8328_I2C)+= snd-soc-es8328-i2c.o
      obj-$(CONFIG_SND_SOC_ES8328_SPI)+= snd-soc-es8328-spi.o
@@@@@@@ -322,7 -321,7 -319,7 -319,7 -318,6 -318,6 +324,7 @@@@@@@ obj-$(CONFIG_SND_SOC_MC13783)  += snd-so
      obj-$(CONFIG_SND_SOC_ML26124)     += snd-soc-ml26124.o
      obj-$(CONFIG_SND_SOC_MSM8916_WCD_ANALOG) +=snd-soc-msm8916-analog.o
      obj-$(CONFIG_SND_SOC_MSM8916_WCD_DIGITAL) +=snd-soc-msm8916-digital.o
    ++obj-$(CONFIG_SND_SOC_NAU8540)   += snd-soc-nau8540.o
      obj-$(CONFIG_SND_SOC_NAU8810)   += snd-soc-nau8810.o
      obj-$(CONFIG_SND_SOC_NAU8825)   += snd-soc-nau8825.o
      obj-$(CONFIG_SND_SOC_HDMI_CODEC)  += snd-soc-hdmi-codec.o
@@@@@@@ -351,8 -350,8 -348,8 -348,8 -346,8 -346,8 +353,8 @@@@@@@ obj-$(CONFIG_SND_SOC_RT5645)   += snd-soc
      obj-$(CONFIG_SND_SOC_RT5651)      += snd-soc-rt5651.o
      obj-$(CONFIG_SND_SOC_RT5659)      += snd-soc-rt5659.o
      obj-$(CONFIG_SND_SOC_RT5660)      += snd-soc-rt5660.o
    --obj-$(CONFIG_SND_SOC_RT5665)      += snd-soc-rt5665.o
      obj-$(CONFIG_SND_SOC_RT5663)      += snd-soc-rt5663.o
    ++obj-$(CONFIG_SND_SOC_RT5665)      += snd-soc-rt5665.o
      obj-$(CONFIG_SND_SOC_RT5670)      += snd-soc-rt5670.o
      obj-$(CONFIG_SND_SOC_RT5677)      += snd-soc-rt5677.o
      obj-$(CONFIG_SND_SOC_RT5677_SPI)  += snd-soc-rt5677-spi.o
@@@@@@@ -451,7 -450,6 -448,6 -448,6 -446,6 -446,6 +453,7 @@@@@@@ obj-$(CONFIG_SND_SOC_WM_ADSP)  += snd-so
      obj-$(CONFIG_SND_SOC_WM_HUBS)     += snd-soc-wm-hubs.o
      
      # Amp
 +++++obj-$(CONFIG_SND_SOC_DIO2125)     += snd-soc-dio2125.o
      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