Merge remote-tracking branches 'asoc/topic/fsl-spdif', 'asoc/topic/hdmi', 'asoc/topic...

diff --combined MAINTAINERS
index 8c20323d127744f86edb0d9d4f565c79bd13fe1e,7304d2e37a9827988f8c816c9d7922adb8a00d9b,7304d2e37a9827988f8c816c9d7922adb8a00d9b,5d84c7cf78a24ce915351ea6b59b940a13927270,ff0938e6a7cecf2b2c9ceaa57d04de412d57991e..ae6a717a30a46bb7666595c350dceb9405606805
--- 1/MAINTAINERS
--- 2/MAINTAINERS
--- 3/MAINTAINERS
--- 4/MAINTAINERS
--- 5/MAINTAINERS
+++ b/MAINTAINERS
@@@@@@ -595,10 -595,6 -595,6 -595,6 -595,6 +595,10 @@@@@@ S:    Odd Fixe
     L: linux-alpha@vger.kernel.org
     F: arch/alpha/
     
 ++++ALPS PS/2 TOUCHPAD DRIVER
 ++++R: Pali Rohár <pali.rohar@gmail.com>
 ++++F: drivers/input/mouse/alps.*
 ++++
     ALTERA MAILBOX DRIVER
     M: Ley Foon Tan <lftan@altera.com>
     L: nios2-dev@lists.rocketboards.org (moderated for non-subscribers)
@@@@@@ -1163,7 -1159,6 -1159,6 -1159,6 -1159,6 +1163,7 @@@@@@ F:        arch/arm/mach-footbridge
     ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
     M: Shawn Guo <shawnguo@kernel.org>
     M: Sascha Hauer <kernel@pengutronix.de>
 ++++R: Fabio Estevam <fabio.estevam@nxp.com>
     L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
     S: Maintained
     T: git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
@@@@@@ -1694,6 -1689,8 -1689,8 -1689,8 -1689,8 +1694,6 @@@@@@ S:        Maintaine
     F: drivers/edac/altera_edac.
     
     ARM/STI ARCHITECTURE
 ----M: Srinivas Kandagatla <srinivas.kandagatla@gmail.com>
 ----M: Maxime Coquelin <maxime.coquelin@st.com>
     M: Patrice Chotard <patrice.chotard@st.com>
     L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
     L: kernel@stlinux.com
@@@@@@ -1726,7 -1723,6 -1723,6 -1723,6 -1723,6 +1726,7 @@@@@@ F:        drivers/ata/ahci_st.
     
     ARM/STM32 ARCHITECTURE
     M: Maxime Coquelin <mcoquelin.stm32@gmail.com>
 ++++M: Alexandre Torgue <alexandre.torgue@st.com>
     L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
     S: Maintained
     T: git git://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/stm32.git
@@@@@@ -2246,8 -2242,7 -2242,7 -2242,7 -2242,7 +2246,8 @@@@@@ F:        include/net/ax25.
     F: net/ax25/
     
     AZ6007 DVB DRIVER
 ----M: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
 ++++M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
 ++++M: Mauro Carvalho Chehab <mchehab@kernel.org>
     L: linux-media@vger.kernel.org
     W: https://linuxtv.org
     T: git git://linuxtv.org/media_tree.git
@@@@@@ -2714,8 -2709,7 -2709,7 -2709,7 -2709,7 +2714,8 @@@@@@ F:        Documentation/filesystems/btrfs.tx
     F: fs/btrfs/
     
     BTTV VIDEO4LINUX DRIVER
 ----M: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
 ++++M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
 ++++M: Mauro Carvalho Chehab <mchehab@kernel.org>
     L: linux-media@vger.kernel.org
     W: https://linuxtv.org
     T: git git://linuxtv.org/media_tree.git
@@@@@@ -2779,9 -2773,9 -2773,9 -2773,9 -2773,9 +2779,9 @@@@@@ F:        include/net/caif
     F: net/caif/
     
     CALGARY x86-64 IOMMU
 ----M: Muli Ben-Yehuda <muli@il.ibm.com>
 ----M: "Jon D. Mason" <jdmason@kudzu.us>
 ----L: discuss@x86-64.org
 ++++M: Muli Ben-Yehuda <mulix@mulix.org>
 ++++M: Jon Mason <jdmason@kudzu.us>
 ++++L: iommu@lists.linux-foundation.org
     S: Maintained
     F: arch/x86/kernel/pci-calgary_64.c
     F: arch/x86/kernel/tce_64.c
@@@@@@ -3092,7 -3086,6 -3086,6 -3086,6 -3086,6 +3092,7 @@@@@@ M:        Stephen Boyd <sboyd@codeaurora.org
     L: linux-clk@vger.kernel.org
     T: git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git
     S: Maintained
 ++++F: Documentation/devicetree/bindings/clock/
     F: drivers/clk/
     X: drivers/clk/clkdev.c
     F: include/linux/clk-pr*
@@@@@@ -3350,8 -3343,7 -3343,7 -3343,7 -3343,7 +3350,8 @@@@@@ S:        Maintaine
     F: drivers/media/dvb-frontends/cx24120*
     
     CX88 VIDEO4LINUX DRIVER
 ----M: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
 ++++M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
 ++++M: Mauro Carvalho Chehab <mchehab@kernel.org>
     L: linux-media@vger.kernel.org
     W: https://linuxtv.org
     T: git git://linuxtv.org/media_tree.git
@@@@@@ -3781,7 -3773,6 -3773,6 -3773,6 -3773,6 +3781,7 @@@@@@ Q:        https://patchwork.kernel.org/project
     S: Maintained
     F: drivers/dma/
     F: include/linux/dmaengine.h
 ++++F: Documentation/devicetree/bindings/dma/
     F: Documentation/dmaengine/
     T: git git://git.infradead.org/users/vkoul/slave-dma.git
     
@@@@@@ -4299,8 -4290,7 -4290,7 -4290,7 -4290,7 +4299,8 @@@@@@ F:        fs/ecryptfs
     EDAC-CORE
     M: Doug Thompson <dougthompson@xmission.com>
     M: Borislav Petkov <bp@alien8.de>
 ----M: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
 ++++M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
 ++++M: Mauro Carvalho Chehab <mchehab@kernel.org>
     L: linux-edac@vger.kernel.org
     T: git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git for-next
     T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git linux_next
@@@@@@ -4345,8 -4335,7 -4335,7 -4335,7 -4335,7 +4345,8 @@@@@@ S:        Maintaine
     F: drivers/edac/e7xxx_edac.c
     
     EDAC-GHES
 ----M: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
 ++++M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
 ++++M: Mauro Carvalho Chehab <mchehab@kernel.org>
     L: linux-edac@vger.kernel.org
     S: Maintained
     F: drivers/edac/ghes_edac.c
@@@@@@ -4370,22 -4359,19 -4359,19 -4359,19 -4359,19 +4370,22 @@@@@@ S:  Maintaine
     F: drivers/edac/i5000_edac.c
     
     EDAC-I5400
 ----M: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
 ++++M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
 ++++M: Mauro Carvalho Chehab <mchehab@kernel.org>
     L: linux-edac@vger.kernel.org
     S: Maintained
     F: drivers/edac/i5400_edac.c
     
     EDAC-I7300
 ----M: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
 ++++M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
 ++++M: Mauro Carvalho Chehab <mchehab@kernel.org>
     L: linux-edac@vger.kernel.org
     S: Maintained
     F: drivers/edac/i7300_edac.c
     
     EDAC-I7CORE
 ----M: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
 ++++M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
 ++++M: Mauro Carvalho Chehab <mchehab@kernel.org>
     L: linux-edac@vger.kernel.org
     S: Maintained
     F: drivers/edac/i7core_edac.c
@@@@@@ -4422,8 -4408,7 -4408,7 -4408,7 -4408,7 +4422,8 @@@@@@ S:        Maintaine
     F: drivers/edac/r82600_edac.c
     
     EDAC-SBRIDGE
 ----M: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
 ++++M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
 ++++M: Mauro Carvalho Chehab <mchehab@kernel.org>
     L: linux-edac@vger.kernel.org
     S: Maintained
     F: drivers/edac/sb_edac.c
@@@@@@ -4476,14 -4461,13 -4461,13 -4461,13 -4461,13 +4476,14 @@@@@@ S:  Orpha
     F: fs/efs/
     
     EHEA (IBM pSeries eHEA 10Gb ethernet adapter) DRIVER
 ----M: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
 ++++M: Douglas Miller <dougmill@linux.vnet.ibm.com>
     L: netdev@vger.kernel.org
     S: Maintained
     F: drivers/net/ethernet/ibm/ehea/
     
     EM28XX VIDEO4LINUX DRIVER
 ----M: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
 ++++M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
 ++++M: Mauro Carvalho Chehab <mchehab@kernel.org>
     L: linux-media@vger.kernel.org
     W: https://linuxtv.org
     T: git git://linuxtv.org/media_tree.git
@@@@@@ -6502,7 -6486,6 -6486,6 -6486,6 -6486,6 +6502,7 @@@@@@ F:        include/uapi/linux/sunrpc
     
     KERNEL SELFTEST FRAMEWORK
     M: Shuah Khan <shuahkh@osg.samsung.com>
 ++++M: Shuah Khan <shuah@kernel.org>
     L: linux-kselftest@vger.kernel.org
     T: git git://git.kernel.org/pub/scm/shuah/linux-kselftest
     S: Maintained
@@@@@@ -7270,6 -7253,6 -7253,6 -7253,6 -7253,13 +7270,13 @@@@@@ F:      Documentation/devicetree/bindings/i2
     F: drivers/hwmon/max6697.c
     F: include/linux/platform_data/max6697.h
     
++++ MAX9860 MONO AUDIO VOICE CODEC DRIVER
++++ M: Peter Rosin <peda@axentia.se>
++++ L: alsa-devel@alsa-project.org (moderated for non-subscribers)
++++ S: Maintained
++++ F: Documentation/devicetree/bindings/sound/max9860.txt
++++ F: sound/soc/codecs/max9860.*
++++ 
     MAXIM MUIC CHARGER DRIVERS FOR EXYNOS BASED BOARDS
     M: Krzysztof Kozlowski <k.kozlowski@samsung.com>
     L: linux-pm@vger.kernel.org
@@@@@@ -7374,8 -7357,7 -7357,7 -7357,7 -7364,7 +7381,8 @@@@@@ S:        Supporte
     F: drivers/media/pci/netup_unidvb/*
     
     MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
 ----M: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
 ++++M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
 ++++M: Mauro Carvalho Chehab <mchehab@kernel.org>
     P: LinuxTV.org Project
     L: linux-media@vger.kernel.org
     W: https://linuxtv.org
@@@@@@ -7423,7 -7405,7 -7405,7 -7405,7 -7412,7 +7430,7 @@@@@@ F:        drivers/scsi/megaraid.
     F: drivers/scsi/megaraid/
     
     MELLANOX ETHERNET DRIVER (mlx4_en)
 ----M:         Eugenia Emantayev <eugenia@mellanox.com>
 ++++M: Tariq Toukan <tariqt@mellanox.com>
     L: netdev@vger.kernel.org
     S: Supported
     W: http://www.mellanox.com
@@@@@@ -7475,7 -7457,6 -7457,6 -7457,6 -7464,6 +7482,7 @@@@@@ Q:        http://patchwork.ozlabs.org/project/
     T: git git://git.infradead.org/linux-mtd.git
     T: git git://git.infradead.org/l2-mtd.git
     S: Maintained
 ++++F: Documentation/devicetree/bindings/mtd/
     F: drivers/mtd/
     F: include/linux/mtd/
     F: include/uapi/mtd/
@@@@@@ -8008,7 -7989,6 -7989,6 -7989,6 -7996,6 +8015,7 @@@@@@ Q:        http://patchwork.ozlabs.org/project/
     T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
     T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git
     S: Odd Fixes
 ++++F: Documentation/devicetree/bindings/net/
     F: drivers/net/
     F: include/linux/if_*
     F: include/linux/netdevice.h
@@@@@@ -8027,7 -8007,6 -8007,6 -8007,6 -8014,6 +8034,7 @@@@@@ Q:        http://patchwork.kernel.org/project/
     T: git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git
     T: git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git
     S: Maintained
 ++++F: Documentation/devicetree/bindings/net/wireless/
     F: drivers/net/wireless/
     
     NETXEN (1/10) GbE SUPPORT
@@@@@@ -8425,9 -8404,10 -8404,10 -8404,10 -8411,10 +8432,9 @@@@@@ F:    drivers/i2c/busses/i2c-ocores.
     OPEN FIRMWARE AND FLATTENED DEVICE TREE
     M: Rob Herring <robh+dt@kernel.org>
     M: Frank Rowand <frowand.list@gmail.com>
 ----M: Grant Likely <grant.likely@linaro.org>
     L: devicetree@vger.kernel.org
     W: http://www.devicetree.org/
 ----T: git git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux.git
 ++++T: git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
     S: Maintained
     F: drivers/of/
     F: include/linux/of*.h
@@@@@@ -8435,10 -8415,12 -8415,12 -8415,12 -8422,12 +8442,10 @@@@@@ F:  scripts/dtc
     
     OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS
     M: Rob Herring <robh+dt@kernel.org>
 ----M: Pawel Moll <pawel.moll@arm.com>
     M: Mark Rutland <mark.rutland@arm.com>
 ----M: Ian Campbell <ijc+devicetree@hellion.org.uk>
 ----M: Kumar Gala <galak@codeaurora.org>
     L: devicetree@vger.kernel.org
     T: git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
 ++++Q: http://patchwork.ozlabs.org/project/devicetree-bindings/list/
     S: Maintained
     F: Documentation/devicetree/
     F: arch/*/boot/dts/
@@@@@@ -8962,8 -8944,6 -8944,6 -8944,6 -8951,6 +8969,8 @@@@@@ M:        Linus Walleij <linus.walleij@linaro.
     L: linux-gpio@vger.kernel.org
     T: git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git
     S: Maintained
 ++++F: Documentation/devicetree/bindings/pinctrl/
 ++++F: Documentation/pinctrl.txt
     F: drivers/pinctrl/
     F: include/linux/pinctrl/
     
@@@@@@ -9871,8 -9851,7 -9851,7 -9851,7 -9858,7 +9878,8 @@@@@@ S:        Odd Fixe
     F: drivers/media/i2c/saa6588*
     
     SAA7134 VIDEO4LINUX DRIVER
 ----M: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
 ++++M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
 ++++M: Mauro Carvalho Chehab <mchehab@kernel.org>
     L: linux-media@vger.kernel.org
     W: https://linuxtv.org
     T: git git://linuxtv.org/media_tree.git
@@@@@@ -10391,8 -10370,7 -10370,7 -10370,7 -10377,7 +10398,8 @@@@@@ S:  Maintaine
     F: drivers/media/radio/si4713/radio-usb-si4713.c
     
     SIANO DVB DRIVER
 ----M: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
 ++++M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
 ++++M: Mauro Carvalho Chehab <mchehab@kernel.org>
     L: linux-media@vger.kernel.org
     W: https://linuxtv.org
     T: git git://linuxtv.org/media_tree.git
@@@@@@ -10724,6 -10702,6 -10702,6 -10702,7 -10709,6 +10731,7 @@@@@@ T:  git git://git.kernel.org/pub/scm/lin
     L: alsa-devel@alsa-project.org (moderated for non-subscribers)
     W: http://alsa-project.org/main/index.php/ASoC
     S: Supported
+++ +F: Documentation/devicetree/bindings/sound/
     F: Documentation/sound/alsa/soc/
     F: sound/soc/
     F: include/sound/soc*
@@@@@@ -11158,8 -11136,7 -11136,7 -11137,7 -11143,7 +11166,8 @@@@@@ S:  Maintaine
     F: drivers/media/i2c/tda9840*
     
     TEA5761 TUNER DRIVER
 ----M: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
 ++++M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
 ++++M: Mauro Carvalho Chehab <mchehab@kernel.org>
     L: linux-media@vger.kernel.org
     W: https://linuxtv.org
     T: git git://linuxtv.org/media_tree.git
@@@@@@ -11167,8 -11144,7 -11144,7 -11145,7 -11151,7 +11175,8 @@@@@@ S:  Odd fixe
     F: drivers/media/tuners/tea5761.*
     
     TEA5767 TUNER DRIVER
 ----M: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
 ++++M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
 ++++M: Mauro Carvalho Chehab <mchehab@kernel.org>
     L: linux-media@vger.kernel.org
     W: https://linuxtv.org
     T: git git://linuxtv.org/media_tree.git
@@@@@@ -11555,8 -11531,7 -11531,7 -11532,7 -11538,7 +11563,8 @@@@@@ F:  include/linux/shmem_fs.
     F: mm/shmem.c
     
     TM6000 VIDEO4LINUX DRIVER
 ----M: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
 ++++M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
 ++++M: Mauro Carvalho Chehab <mchehab@kernel.org>
     L: linux-media@vger.kernel.org
     W: https://linuxtv.org
     T: git git://linuxtv.org/media_tree.git
@@@@@@ -11910,8 -11885,7 -11885,7 -11886,7 -11892,7 +11918,8 @@@@@@ F:  drivers/usb/common/usb-otg-fsm.
     
     USB OVER IP DRIVER
     M: Valentina Manea <valentina.manea.m@gmail.com>
 ----M: Shuah Khan <shuah.kh@samsung.com>
 ++++M: Shuah Khan <shuahkh@osg.samsung.com>
 ++++M: Shuah Khan <shuah@kernel.org>
     L: linux-usb@vger.kernel.org
     S: Maintained
     F: Documentation/usb/usbip_protocol.txt
@@@@@@ -11982,7 -11956,6 -11956,6 -11957,6 -11963,6 +11990,7 @@@@@@ L:  linux-usb@vger.kernel.or
     W: http://www.linux-usb.org
     T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
     S: Supported
 ++++F: Documentation/devicetree/bindings/usb/
     F: Documentation/usb/
     F: drivers/usb/
     F: include/linux/usb.h
@@@@@@ -12156,7 -12129,6 -12129,6 -12130,6 -12136,6 +12164,7 @@@@@@ VIRTIO CORE, NET AND BLOCK DRIVER
     M: "Michael S. Tsirkin" <mst@redhat.com>
     L: virtualization@lists.linux-foundation.org
     S: Maintained
 ++++F: Documentation/devicetree/bindings/virtio/
     F: drivers/virtio/
     F: tools/virtio/
     F: drivers/net/virtio_net.c
@@@@@@ -12545,8 -12517,7 -12517,7 -12518,7 -12524,7 +12553,8 @@@@@@ S:  Maintaine
     F: arch/x86/entry/vdso/
     
     XC2028/3028 TUNER DRIVER
 ----M: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
 ++++M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
 ++++M: Mauro Carvalho Chehab <mchehab@kernel.org>
     L: linux-media@vger.kernel.org
     W: https://linuxtv.org
     T: git git://linuxtv.org/media_tree.git

diff --combined sound/soc/codecs/Kconfig
index acba444fe4754c9a26b0f63a00e2cba2e07f0950,4d82a58ff6b0b9c43c9f6f892ecbd6ab79e44de8,4d82a58ff6b0b9c43c9f6f892ecbd6ab79e44de8,4d82a58ff6b0b9c43c9f6f892ecbd6ab79e44de8,d92ff24628e5f83bc345c5760760989f1e1234ef..7f516b6ee15040b4c6f91e4661892482b5b3b35f
--- 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
@@@@@@ -32,7 -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 +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 +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,6 -84,6 -84,6 -84,6 -84,7 +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
@@@@@@ -272,12 -269,8 -269,8 -269,8 -270,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"
@@@@@@ -287,7 -280,6 -280,6 -280,6 -281,6 +288,7 @@@@@@
     config SND_SOC_ADAU17X1
        tristate
        select SND_SOC_SIGMADSP_REGMAP
 ++++   select SND_SOC_ADAU_UTILS
     
     config SND_SOC_ADAU1761
        tristate
@@@@@@ -330,9 -322,6 -322,6 -322,6 -323,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
     
@@@@@@ -382,7 -371,7 -371,7 -371,7 -372,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
@@@@@@ -391,10 -380,6 -380,6 -380,6 -381,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
     
@@@@@@ -465,11 -450,6 -450,6 -450,6 -451,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
@@@@@@ -503,10 -483,9 -483,9 -483,9 -484,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"
@@@@@@ -568,6 -547,6 -547,6 -547,6 -548,11 +569,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 8d118381dd62a88dfc7ff13179438238164e24af,0f548fd34ca3fd9e8a1b080cd2d38a480c3c5212,0f548fd34ca3fd9e8a1b080cd2d38a480c3c5212,0f548fd34ca3fd9e8a1b080cd2d38a480c3c5212,2dbbd45a0dd39e6600b02dfcdfb2613f2c8ae59c..ff97d7392e8bea9f58d3b3546e69507fcd032d41
--- 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
@@@@@@ -7,7 -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 +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 +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 +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,6 -79,6 -79,6 -79,6 -79,7 +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
@@@@@@ -224,7 -220,6 -220,6 -220,6 -221,6 +225,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
@@@@@@ -237,7 -232,6 -232,6 -232,6 -233,6 +238,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
@@@@@@ -256,7 -250,6 -250,6 -250,6 -251,6 +257,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
@@@@@@ -271,7 -264,6 -264,6 -264,6 -265,6 +272,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
@@@@@@ -301,6 -293,6 -293,6 -293,6 -294,7 +302,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