diff options
author | Mark Brown <broonie@kernel.org> | 2018-12-18 12:23:59 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-12-18 12:23:59 +0000 |
commit | a7a850dba82498a1e050d8d153cae67ce0edb3b2 (patch) | |
tree | f2b50444022ad27f407e087a820ae5ff248e0492 /MAINTAINERS | |
parent | c5fd9e77be44360b4827069c59f524815517917b (diff) | |
parent | 0f4967bc21de0bb9e107f9ad3ced852daf66acd2 (diff) |
Merge branch 'asoc-4.21' into asoc-next
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 3318f30903b2..5b9c6af98283 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1310,6 +1310,13 @@ F: drivers/pinctrl/meson/ F: drivers/mmc/host/meson* N: meson +ARM/Amlogic Meson SoC Sound Drivers +M: Jerome Brunet <jbrunet@baylibre.com> +L: alsa-devel@alsa-project.org (moderated for non-subscribers) +S: Maintained +F: sound/soc/meson/ +F: Documentation/devicetree/bindings/sound/amlogic* + ARM/Annapurna Labs ALPINE ARCHITECTURE M: Tsahee Zidenberg <tsahee@annapurnalabs.com> M: Antoine Tenart <antoine.tenart@bootlin.com> @@ -10795,7 +10802,10 @@ M: Jarkko Nikula <jarkko.nikula@bitmer.com> L: alsa-devel@alsa-project.org (moderated for non-subscribers) L: linux-omap@vger.kernel.org S: Maintained -F: sound/soc/omap/ +F: sound/soc/ti/omap* +F: sound/soc/ti/rx51.c +F: sound/soc/ti/n810.c +F: sound/soc/ti/sdma-pcm.* OMAP CLOCK FRAMEWORK SUPPORT M: Paul Walmsley <paul@pwsan.com> @@ -14839,6 +14849,12 @@ F: Documentation/devicetree/bindings/clock/ti,sci-clk.txt F: drivers/clk/keystone/sci-clk.c F: drivers/reset/reset-ti-sci.c +Texas Instruments ASoC drivers +M: Peter Ujfalusi <peter.ujfalusi@ti.com> +L: alsa-devel@alsa-project.org (moderated for non-subscribers) +S: Maintained +F: sound/soc/ti/ + THANKO'S RAREMONO AM/FM/SW RADIO RECEIVER USB DRIVER M: Hans Verkuil <hverkuil@xs4all.nl> L: linux-media@vger.kernel.org |