Merge existing fixes from asoc/for-5.11 (984fcd3f) · Commits · EulixOS / Software / Kernel

Documentation/devicetree/bindings/sound/ti,j721e-cpb-audio.yaml

+3 −1

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
		# Copyright (C) 2020 Texas Instruments Incorporated
		# Author: Peter Ujfalusi <peter.ujfalusi@ti.com>
		%YAML 1.2
		---
		$id: http://devicetree.org/schemas/sound/ti,j721e-cpb-audio.yaml#
		@@ -7,7 +9,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
		title: Texas Instruments J721e Common Processor Board Audio Support

		maintainers:
		- Peter Ujfalusi <peter.ujfalusi@ti.com>
		- Peter Ujfalusi <peter.ujfalusi@gmail.com>

		description: \|
		The audio support on the board is using pcm3168a codec connected to McASP10

+3 −1

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
		# Copyright (C) 2020 Texas Instruments Incorporated
		# Author: Peter Ujfalusi <peter.ujfalusi@ti.com>
		%YAML 1.2
		---
		$id: http://devicetree.org/schemas/sound/ti,j721e-cpb-ivi-audio.yaml#
		@@ -7,7 +9,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
		title: Texas Instruments J721e Common Processor Board Audio Support

		maintainers:
		- Peter Ujfalusi <peter.ujfalusi@ti.com>
		- Peter Ujfalusi <peter.ujfalusi@gmail.com>

		description: \|
		The Infotainment board plugs into the Common Processor Board, the support of the

+3 −3

Original line number	Diff line number	Diff line
		@@ -12850,7 +12850,7 @@ F: include/misc/ocxl*
		F: include/uapi/misc/ocxl.h

		OMAP AUDIO SUPPORT
		M: Peter Ujfalusi <peter.ujfalusi@ti.com>
		M: Peter Ujfalusi <peter.ujfalusi@gmail.com>
		M: Jarkko Nikula <jarkko.nikula@bitmer.com>
		L: alsa-devel@alsa-project.org (moderated for non-subscribers)
		L: linux-omap@vger.kernel.org
		@@ -17541,7 +17541,7 @@ F: arch/xtensa/
		F: drivers/irqchip/irq-xtensa-*

		TEXAS INSTRUMENTS ASoC DRIVERS
		M: Peter Ujfalusi <peter.ujfalusi@ti.com>
		M: Peter Ujfalusi <peter.ujfalusi@gmail.com>
		L: alsa-devel@alsa-project.org (moderated for non-subscribers)
		S: Maintained
		F: sound/soc/ti/
		@@ -17838,7 +17838,7 @@ F: Documentation/devicetree/bindings/net/nfc/trf7970a.txt
		F: drivers/nfc/trf7970a.c

		TI TWL4030 SERIES SOC CODEC DRIVER
		M: Peter Ujfalusi <peter.ujfalusi@ti.com>
		M: Peter Ujfalusi <peter.ujfalusi@gmail.com>
		L: alsa-devel@alsa-project.org (moderated for non-subscribers)
		S: Maintained
		F: sound/soc/codecs/twl4030*

+2 −2

Original line number	Diff line number	Diff line
		@@ -143,7 +143,7 @@ config SND_MCHP_SOC_SPDIFTX
		- sama7g5

		This S/PDIF TX driver is compliant with IEC-60958 standard and
		includes programable User Data and Channel Status fields.
		includes programmable User Data and Channel Status fields.

		config SND_MCHP_SOC_SPDIFRX
		tristate "Microchip ASoC driver for boards using S/PDIF RX"
		@@ -157,5 +157,5 @@ config SND_MCHP_SOC_SPDIFRX
		- sama7g5

		This S/PDIF RX driver is compliant with IEC-60958 standard and
		includes programable User Data and Channel Status fields.
		includes programmable User Data and Channel Status fields.
		endif

+1 −1

Original line number	Diff line number	Diff line
		@@ -457,7 +457,7 @@ config SND_SOC_ADAU7118_HW
		help
		Enable support for the Analog Devices ADAU7118 8 Channel PDM-to-I2S/TDM
		Converter. In this mode, the device works in standalone mode which
		means that there is no bus to comunicate with it. Stereo mode is not
		means that there is no bus to communicate with it. Stereo mode is not
		supported in this mode.

		To compile this driver as a module, choose M here: the module