Merge remote-tracking branches 'asoc/topic/nau8824', 'asoc/topic/omap', 'asoc/topic...

diff --combined sound/soc/codecs/Kconfig
index 1957521eabcd906a05db817fcbae69568f845dca,fc6162191da6cfeeb39f993c13f1d42d7ee7bcd1,e49e9da7f1f6e41028a0ca832e76e7dce0bc1c01,e49e9da7f1f6e41028a0ca832e76e7dce0bc1c01,e49e9da7f1f6e41028a0ca832e76e7dce0bc1c01..883ed4c8a5510fb9090ad1889976003960781d89
--- 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
+++ b/sound/soc/codecs/Kconfig
@@@@@@ -49,7 -49,6 -49,6 -49,6 -49,6 +49,7 @@@@@@ config SND_SOC_ALL_CODEC
        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,11 -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
@@@@@@ -92,7 -89,6 -89,6 -89,6 -89,6 +92,7 @@@@@@
        select SND_SOC_MAX9867 if I2C
        select SND_SOC_MAX98925 if I2C
        select SND_SOC_MAX98926 if I2C
 ++++   select SND_SOC_MAX98927 if I2C
        select SND_SOC_MAX9850 if I2C
        select SND_SOC_MAX9860 if I2C
        select SND_SOC_MAX9768 if I2C
@@@@@@ -101,6 -97,7 -97,6 -97,6 -97,6 +101,7 @@@@@@
        select SND_SOC_ML26124 if I2C
        select SND_SOC_NAU8540 if I2C
        select SND_SOC_NAU8810 if I2C
+ +++   select SND_SOC_NAU8824 if I2C
        select SND_SOC_NAU8825 if I2C
        select SND_SOC_HDMI_CODEC
        select SND_SOC_PCM1681 if I2C
@@@@@@ -307,14 -304,12 -303,12 -303,12 -303,12 +308,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
     
@@@@@@ -414,10 -409,6 -408,6 -408,6 -408,6 +415,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
@@@@@@ -526,10 -517,6 -516,6 -516,6 -516,6 +527,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
     
@@@@@@ -539,9 -526,6 -525,6 -525,6 -525,6 +540,9 @@@@@@ 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
     
@@@@@@ -605,10 -589,6 -588,6 -588,6 -588,6 +606,10 @@@@@@ config SND_SOC_MAX9892
     config SND_SOC_MAX98926
        tristate
     
 ++++config SND_SOC_MAX98927
 ++++   tristate "Maxim Integrated MAX98927 Speaker Amplifier"
 ++++   depends on I2C
 ++++
     config SND_SOC_MAX9850
        tristate
     
@@@@@@ -1137,6 -1117,10 -1116,6 -1116,6 -1116,6 +1138,10 @@@@@@ config SND_SOC_NAU881
        tristate "Nuvoton Technology Corporation NAU88C10 CODEC"
        depends on I2C
     
+ +++config SND_SOC_NAU8824
+ +++   tristate "Nuvoton Technology Corporation NAU88L24 CODEC"
+ +++   depends on I2C
+ +++
     config SND_SOC_NAU8825
        tristate
     

diff --combined sound/soc/codecs/Makefile
index 966eb2e91dbb0e0aeb47fea1e172a0780a95fab3,c1929e1f1b6572824bf6ef9fdfbca019237d7b3c,1796cb987e712c78b0fe8f3aa8ec71177256b5b2,1796cb987e712c78b0fe8f3aa8ec71177256b5b2,1796cb987e712c78b0fe8f3aa8ec71177256b5b2..28a63fdaf982fdf6b15afcdc56fd11f89698c250
--- 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
+++ b/sound/soc/codecs/Makefile
@@@@@@ -39,7 -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,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
@@@@@@ -86,7 -84,6 -84,6 -84,6 -84,6 +86,7 @@@@@@ snd-soc-max98371-objs := max98371.
     snd-soc-max9867-objs := max9867.o
     snd-soc-max98925-objs := max98925.o
     snd-soc-max98926-objs := max98926.o
 ++++snd-soc-max98927-objs := max98927.o
     snd-soc-max9850-objs := max9850.o
     snd-soc-max9860-objs := max9860.o
     snd-soc-mc13783-objs := mc13783.o
@@@@@@ -95,6 -92,7 -92,6 -92,6 -92,6 +95,7 @@@@@@ snd-soc-msm8916-analog-objs := msm8916-
     snd-soc-msm8916-digital-objs := msm8916-wcd-digital.o
     snd-soc-nau8540-objs := nau8540.o
     snd-soc-nau8810-objs := nau8810.o
+ +++snd-soc-nau8824-objs := nau8824.o
     snd-soc-nau8825-objs := nau8825.o
     snd-soc-hdmi-codec-objs := hdmi-codec.o
     snd-soc-pcm1681-objs := pcm1681.o
@@@@@@ -224,7 -222,6 -221,6 -221,6 -221,6 +225,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
@@@@@@ -273,7 -270,6 -269,6 -269,6 -269,6 +274,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
@@@@@@ -298,7 -294,6 -293,6 -293,6 -293,6 +299,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
@@@@@@ -319,7 -314,6 -313,6 -313,6 -313,6 +320,7 @@@@@@ obj-$(CONFIG_SND_SOC_MAX98357A) += snd-
     obj-$(CONFIG_SND_SOC_MAX9867)      += snd-soc-max9867.o
     obj-$(CONFIG_SND_SOC_MAX98925)     += snd-soc-max98925.o
     obj-$(CONFIG_SND_SOC_MAX98926)     += snd-soc-max98926.o
 ++++obj-$(CONFIG_SND_SOC_MAX98927)     += snd-soc-max98927.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
@@@@@@ -328,6 -322,7 -321,6 -321,6 -321,6 +329,7 @@@@@@ obj-$(CONFIG_SND_SOC_MSM8916_WCD_ANALOG
     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_NAU8824)   += snd-soc-nau8824.o
     obj-$(CONFIG_SND_SOC_NAU8825)   += snd-soc-nau8825.o
     obj-$(CONFIG_SND_SOC_HDMI_CODEC)   += snd-soc-hdmi-codec.o
     obj-$(CONFIG_SND_SOC_PCM1681)      += snd-soc-pcm1681.o
@@@@@@ -455,7 -450,6 -448,6 -448,6 -448,6 +457,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