Merge remote-tracking branch 'asoc/for-5.15' into asoc-linus (38b76730) · Commits · EulixOS / Software / Kernel

Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@ Required properties:
		"ti,da830-mcasp-audio" : for both DA830 & DA850 platforms
		"ti,am33xx-mcasp-audio" : for AM33xx platforms (AM33xx, AM43xx, TI81xx)
		"ti,dra7-mcasp-audio" : for DRA7xx platforms
		"ti,omap4-mcasp-audio" : for OMAP4

		- reg : Should contain reg specifiers for the entries in the reg-names property.
		- reg-names : Should contain:

Documentation/devicetree/bindings/sound/ics43432.txt

+4 −2

Original line number	Diff line number	Diff line
		Invensense ICS-43432 MEMS microphone with I2S output.
		Invensense ICS-43432-compatible MEMS microphone with I2S output.

		There are no software configuration options for this device, indeed, the only
		host connection is the I2S interface. Apart from requirements on clock
		@@ -8,7 +8,9 @@ contain audio data. A hardware pin determines if the device outputs data
		on the left or right channel of the I2S frame.

		Required properties:
		- compatible : Must be "invensense,ics43432"
		- compatible: should be one of the following.
		"invensense,ics43432": For the Invensense ICS43432
		"cui,cmm-4030d-261": For the CUI CMM-4030D-261-I2S-TR

		Example:

Documentation/devicetree/bindings/sound/mt8195-afe-pcm.yaml

0 → 100644

+184 −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/mt8195-afe-pcm.yaml#
		$schema: http://devicetree.org/meta-schemas/core.yaml#

		title: Mediatek AFE PCM controller for mt8195

		maintainers:
		- Trevor Wu <trevor.wu@mediatek.com>

		properties:
		compatible:
		const: mediatek,mt8195-audio

		reg:
		maxItems: 1

		interrupts:
		maxItems: 1

		mediatek,topckgen:
		$ref: "/schemas/types.yaml#/definitions/phandle"
		description: The phandle of the mediatek topckgen controller

		power-domains:
		maxItems: 1

		clocks:
		items:
		- description: 26M clock
		- description: audio pll1 clock
		- description: audio pll2 clock
		- description: clock divider for i2si1_mck
		- description: clock divider for i2si2_mck
		- description: clock divider for i2so1_mck
		- description: clock divider for i2so2_mck
		- description: clock divider for dptx_mck
		- description: a1sys hoping clock
		- description: audio intbus clock
		- description: audio hires clock
		- description: audio local bus clock
		- description: mux for dptx_mck
		- description: mux for i2so1_mck
		- description: mux for i2so2_mck
		- description: mux for i2si1_mck
		- description: mux for i2si2_mck
		- description: audio infra 26M clock
		- description: infra bus clock

		clock-names:
		items:
		- const: clk26m
		- const: apll1_ck
		- const: apll2_ck
		- const: apll12_div0
		- const: apll12_div1
		- const: apll12_div2
		- const: apll12_div3
		- const: apll12_div9
		- const: a1sys_hp_sel
		- const: aud_intbus_sel
		- const: audio_h_sel
		- const: audio_local_bus_sel
		- const: dptx_m_sel
		- const: i2so1_m_sel
		- const: i2so2_m_sel
		- const: i2si1_m_sel
		- const: i2si2_m_sel
		- const: infra_ao_audio_26m_b
		- const: scp_adsp_audiodsp

		mediatek,etdm-in1-chn-disabled:
		$ref: /schemas/types.yaml#/definitions/uint8-array
		maxItems: 24
		description: Specify which input channel should be disabled.

		mediatek,etdm-in2-chn-disabled:
		$ref: /schemas/types.yaml#/definitions/uint8-array
		maxItems: 16
		description: Specify which input channel should be disabled.

		patternProperties:
		"^mediatek,etdm-in[1-2]-mclk-always-on-rate-hz$":
		description: Specify etdm in mclk output rate for always on case.

		"^mediatek,etdm-out[1-3]-mclk-always-on-rate-hz$":
		description: Specify etdm out mclk output rate for always on case.

		"^mediatek,etdm-in[1-2]-multi-pin-mode$":
		type: boolean
		description: if present, the etdm data mode is I2S.

		"^mediatek,etdm-out[1-3]-multi-pin-mode$":
		type: boolean
		description: if present, the etdm data mode is I2S.

		"^mediatek,etdm-in[1-2]-cowork-source$":
		$ref: /schemas/types.yaml#/definitions/uint32
		description: \|
		etdm modules can share the same external clock pin. Specify
		which etdm clock source is required by this etdm in moudule.
		enum:
		- 0 # etdm1_in
		- 1 # etdm2_in
		- 2 # etdm1_out
		- 3 # etdm2_out

		"^mediatek,etdm-out[1-2]-cowork-source$":
		$ref: /schemas/types.yaml#/definitions/uint32
		description: \|
		etdm modules can share the same external clock pin. Specify
		which etdm clock source is required by this etdm out moudule.
		enum:
		- 0 # etdm1_in
		- 1 # etdm2_in
		- 2 # etdm1_out
		- 3 # etdm2_out

		required:
		- compatible
		- reg
		- interrupts
		- mediatek,topckgen
		- power-domains
		- clocks
		- clock-names

		additionalProperties: false

		examples:
		- \|
		#include <dt-bindings/clock/mt8195-clk.h>
		#include <dt-bindings/interrupt-controller/arm-gic.h>
		#include <dt-bindings/interrupt-controller/irq.h>
		#include <dt-bindings/power/mt8195-power.h>

		afe: mt8195-afe-pcm@10890000 {
		compatible = "mediatek,mt8195-audio";
		reg = <0x10890000 0x10000>;
		interrupts = <GIC_SPI 822 IRQ_TYPE_LEVEL_HIGH 0>;
		mediatek,topckgen = <&topckgen>;
		power-domains = <&spm MT8195_POWER_DOMAIN_AUDIO>;
		clocks = <&clk26m>,
		<&topckgen CLK_TOP_APLL1>,
		<&topckgen CLK_TOP_APLL2>,
		<&topckgen CLK_TOP_APLL12_DIV0>,
		<&topckgen CLK_TOP_APLL12_DIV1>,
		<&topckgen CLK_TOP_APLL12_DIV2>,
		<&topckgen CLK_TOP_APLL12_DIV3>,
		<&topckgen CLK_TOP_APLL12_DIV9>,
		<&topckgen CLK_TOP_A1SYS_HP_SEL>,
		<&topckgen CLK_TOP_AUD_INTBUS_SEL>,
		<&topckgen CLK_TOP_AUDIO_H_SEL>,
		<&topckgen CLK_TOP_AUDIO_LOCAL_BUS_SEL>,
		<&topckgen CLK_TOP_DPTX_M_SEL>,
		<&topckgen CLK_TOP_I2SO1_M_SEL>,
		<&topckgen CLK_TOP_I2SO2_M_SEL>,
		<&topckgen CLK_TOP_I2SI1_M_SEL>,
		<&topckgen CLK_TOP_I2SI2_M_SEL>,
		<&infracfg_ao CLK_INFRA_AO_AUDIO_26M_B>,
		<&scp_adsp CLK_SCP_ADSP_AUDIODSP>;
		clock-names = "clk26m",
		"apll1_ck",
		"apll2_ck",
		"apll12_div0",
		"apll12_div1",
		"apll12_div2",
		"apll12_div3",
		"apll12_div9",
		"a1sys_hp_sel",
		"aud_intbus_sel",
		"audio_h_sel",
		"audio_local_bus_sel",
		"dptx_m_sel",
		"i2so1_m_sel",
		"i2so2_m_sel",
		"i2si1_m_sel",
		"i2si2_m_sel",
		"infra_ao_audio_26m_b",
		"scp_adsp_audiodsp";
		};

		...

Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1019-rt5682.yaml

0 → 100644

+47 −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/mt8195-mt6359-rt1019-rt5682.yaml#
		$schema: http://devicetree.org/meta-schemas/core.yaml#

		title: Mediatek MT8195 with MT6359, RT1019 and RT5682 ASoC sound card driver

		maintainers:
		- Trevor Wu <trevor.wu@mediatek.com>

		description:
		This binding describes the MT8195 sound card.

		properties:
		compatible:
		const: mediatek,mt8195_mt6359_rt1019_rt5682

		mediatek,platform:
		$ref: "/schemas/types.yaml#/definitions/phandle"
		description: The phandle of MT8195 ASoC platform.

		mediatek,dptx-codec:
		$ref: "/schemas/types.yaml#/definitions/phandle"
		description: The phandle of MT8195 Display Port Tx codec node.

		mediatek,hdmi-codec:
		$ref: "/schemas/types.yaml#/definitions/phandle"
		description: The phandle of MT8195 HDMI codec node.

		additionalProperties: false

		required:
		- compatible
		- mediatek,platform

		examples:
		- \|

		sound: mt8195-sound {
		compatible = "mediatek,mt8195_mt6359_rt1019_rt5682";
		mediatek,platform = <&afe>;
		pinctrl-names = "default";
		pinctrl-0 = <&aud_pins_default>;
		};

		...

Documentation/devicetree/bindings/sound/realtek,rt1015p.yaml

+3 −1

Original line number	Diff line number	Diff line
		@@ -15,7 +15,9 @@ description: \|

		properties:
		compatible:
		const: realtek,rt1015p
		enum:
		- realtek,rt1015p
		- realtek,rt1019p

		sdb-gpios:
		description: