From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 3 Jun 2021 03:07:54 +0000 (+1000)
Subject: Merge remote-tracking branch 'sound-asoc/for-next'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=02da0391fa16a7d8941a4e6381042dac9750fd2f;p=users%2Fjedix%2Flinux-maple.git

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

02da0391fa16a7d8941a4e6381042dac9750fd2f
diff --cc MAINTAINERS
index f81e5088bb9c3,b4094f07214ea..6b29beaa7470d
--- a/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