Merge branch 'asoc-5.6' into asoc-next (a7196caf) · Commits · 戴 / test

Documentation/devicetree/bindings/sound/amlogic,axg-fifo.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,9 @@ Required properties:
		* "arb" : memory ARB line (required)
		* "rst" : dedicated device reset line (optional)
		- #sound-dai-cells: must be 0.
		- amlogic,fifo-depth: The size of the controller's fifo in bytes. This
		is useful for determining certain configuration such
		as the flush threshold of the fifo

		Example of FRDDR A on the A113 SoC:

		@@ -27,4 +30,5 @@ frddr_a: audio-controller@1c0 {
		interrupts = <GIC_SPI 88 IRQ_TYPE_EDGE_RISING>;
		clocks = <&clkc_audio AUD_CLKID_FRDDR_A>;
		resets = <&arb AXG_ARB_FRDDR_A>;
		fifo-depth = <512>;
		};

+11 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,12 @@ three substreams within totally 10 channels.

		Required properties:

		- compatible : Contains "fsl,imx35-asrc" or "fsl,imx53-asrc".
		- compatible : Compatible list, should contain one of the following
		compatibles:
		"fsl,imx35-asrc",
		"fsl,imx53-asrc",
		"fsl,imx8qm-asrc",
		"fsl,imx8qxp-asrc",

		- reg : Offset and length of the register set for the device.

		@@ -35,6 +40,11 @@ Required properties:

		- fsl,asrc-width : Defines a mutual sample width used by DPCM Back Ends.

		- fsl,asrc-clk-map : Defines clock map used in driver. which is required
		by imx8qm/imx8qxp platform
		<0> - select the map for asrc0 in imx8qm/imx8qxp
		<1> - select the map for asrc1 in imx8qm/imx8qxp

		Optional properties:

		- big-endian : If this property is absent, the little endian mode

+8 −2

Original line number	Diff line number	Diff line
		GTM601 UMTS modem audio interface CODEC

		This device has no configuration interface. Sample rate is fixed - 8kHz.
		This device has no configuration interface. The sample rate and channels are
		based on the compatible string
		"option,gtm601" = 8kHz mono
		"broadmobi,bm818" = 48KHz stereo

		Required properties:

		- compatible : "option,gtm601"
		- compatible : one of
		"option,gtm601"
		"broadmobi,bm818"


		Example:

0 → 100644

+55 −0

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
		%YAML 1.2
		---
		$id: http://devicetree.org/schemas/sound/ingenic,codec.yaml#
		$schema: http://devicetree.org/meta-schemas/core.yaml#

		title: Ingenic JZ47xx internal codec DT bindings

		maintainers:
		- Paul Cercueil <paul@crapouillou.net>

		properties:
		$nodename:
		pattern: '^audio-codec@.*'

		compatible:
		oneOf:
		- const: ingenic,jz4770-codec
		- const: ingenic,jz4725b-codec
		- const: ingenic,jz4740-codec

		reg:
		maxItems: 1

		clocks:
		maxItems: 1

		clock-names:
		items:
		- const: aic

		'#sound-dai-cells':
		const: 0

		additionalProperties: false

		required:
		- compatible
		- reg
		- clocks
		- clock-names
		- '#sound-dai-cells'

		examples:
		- \|
		#include <dt-bindings/clock/jz4740-cgu.h>
		codec: audio-codec@10020080 {
		compatible = "ingenic,jz4740-codec";
		reg = <0x10020080 0x8>;
		#sound-dai-cells = <0>;
		clocks = <&cgu JZ4740_CLK_AIC>;
		clock-names = "aic";
		};

		...

deleted100644 → 0

+0 −20

Original line number	Diff line number	Diff line
		Ingenic JZ4725B codec controller

		Required properties:
		- compatible : "ingenic,jz4725b-codec"
		- reg : codec registers location and length
		- clocks : phandle to the AIC clock.
		- clock-names: must be set to "aic".
		- #sound-dai-cells: Must be set to 0.

		Example:

		codec: audio-codec@100200a4 {
		compatible = "ingenic,jz4725b-codec";
		reg = <0x100200a4 0x8>;

		#sound-dai-cells = <0>;

		clocks = <&cgu JZ4725B_CLK_AIC>;
		clock-names = "aic";
		};