Merge remote-tracking branch 'sound-asoc/for-next'

diff --cc MAINTAINERS
index f81e5088bb9c3c1f20f2c663197d54c1b06a81db,b4094f07214ea574c94408c9dc3ceb156b652ac4..6b29beaa7470d8ee496d8ca5af67befb846e2677
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -13265,9 -13212,16 +13265,16 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/sound/tfa9879.txt
  F:    sound/soc/codecs/tfa9879*
  
+ NXP/Goodix TFA989X (TFA1) DRIVER
+ M:    Stephan Gerhold <stephan@gerhold.net>
+ L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/sound/nxp,tfa989x.yaml
+ F:    sound/soc/codecs/tfa989x.c
+ 
  NXP-NCI NFC DRIVER
  R:    Charles Gorand <charles.gorand@effinnov.com>
 -L:    linux-nfc@lists.01.org (moderated for non-subscribers)
 +L:    linux-nfc@lists.01.org (subscribers-only)
  S:    Supported
  F:    drivers/nfc/nxp-nci
  

diff --cc sound/soc/soc-core.c
Simple merge