mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-27 12:57:53 +00:00
ASoC: dt-bindings: mt8186: Document audio-routing and dai-link subnode
Document the dai-link subnodes and the audio-routing property, allowing to describe machine specific audio hardware and links in device tree. While at it, also deprecate the old properties which were previously used with the driver's partially hardcoded configuration. Also, since describing machine specific audio hardware and links replaces the now deprecated old logic doing the same in a driver hardcoded fashion, it is not allowed to have both the old and new properties together. Reviewed-by: Rob Herring <robh@kernel.org> Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Link: https://lore.kernel.org/r/20240416071410.75620-17-angelogioacchino.delregno@collabora.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
AngeloGioacchino Del Regno
Mark Brown
parent
5a50483c47
commit
787f190cd1
2 changed files with 233 additions and 18 deletions
|
|
@ -12,17 +12,46 @@ maintainers:
|
|||
description:
|
||||
This binding describes the MT8186 sound card.
|
||||
|
||||
allOf:
|
||||
- $ref: sound-card-common.yaml#
|
||||
|
||||
properties:
|
||||
compatible:
|
||||
enum:
|
||||
- mediatek,mt8186-mt6366-da7219-max98357-sound
|
||||
|
||||
audio-routing:
|
||||
$ref: /schemas/types.yaml#/definitions/non-unique-string-array
|
||||
description:
|
||||
A list of the connections between audio components. Each entry is a
|
||||
pair of strings, the first being the connection's sink, the second
|
||||
being the connection's source.
|
||||
Valid names could be the input or output widgets of audio components,
|
||||
power supplies, MicBias of codec and the software switch.
|
||||
minItems: 2
|
||||
items:
|
||||
enum:
|
||||
# Sinks
|
||||
- HDMI1
|
||||
- Headphones
|
||||
- Line Out
|
||||
- MIC
|
||||
- Speakers
|
||||
|
||||
# Sources
|
||||
- Headset Mic
|
||||
- HPL
|
||||
- HPR
|
||||
- Speaker
|
||||
- TX
|
||||
|
||||
mediatek,platform:
|
||||
$ref: /schemas/types.yaml#/definitions/phandle
|
||||
description: The phandle of MT8186 ASoC platform.
|
||||
|
||||
headset-codec:
|
||||
type: object
|
||||
deprecated: true
|
||||
additionalProperties: false
|
||||
properties:
|
||||
sound-dai:
|
||||
|
|
@ -32,6 +61,7 @@ properties:
|
|||
|
||||
playback-codecs:
|
||||
type: object
|
||||
deprecated: true
|
||||
additionalProperties: false
|
||||
properties:
|
||||
sound-dai:
|
||||
|
|
@ -53,32 +83,115 @@ properties:
|
|||
A list of the desired dai-links in the sound card. Each entry is a
|
||||
name defined in the machine driver.
|
||||
|
||||
additionalProperties: false
|
||||
patternProperties:
|
||||
".*-dai-link$":
|
||||
type: object
|
||||
additionalProperties: false
|
||||
description:
|
||||
Container for dai-link level properties and CODEC sub-nodes.
|
||||
|
||||
properties:
|
||||
link-name:
|
||||
description: Indicates dai-link name and PCM stream name
|
||||
items:
|
||||
enum:
|
||||
- I2S0
|
||||
- I2S1
|
||||
- I2S2
|
||||
- I2S3
|
||||
|
||||
codec:
|
||||
description: Holds subnode which indicates codec dai.
|
||||
type: object
|
||||
additionalProperties: false
|
||||
properties:
|
||||
sound-dai:
|
||||
minItems: 1
|
||||
maxItems: 2
|
||||
required:
|
||||
- sound-dai
|
||||
|
||||
dai-format:
|
||||
description: audio format
|
||||
items:
|
||||
enum:
|
||||
- i2s
|
||||
- right_j
|
||||
- left_j
|
||||
- dsp_a
|
||||
- dsp_b
|
||||
|
||||
mediatek,clk-provider:
|
||||
$ref: /schemas/types.yaml#/definitions/string
|
||||
description: Indicates dai-link clock master.
|
||||
items:
|
||||
enum:
|
||||
- cpu
|
||||
- codec
|
||||
|
||||
required:
|
||||
- link-name
|
||||
|
||||
unevaluatedProperties: false
|
||||
|
||||
required:
|
||||
- compatible
|
||||
- mediatek,platform
|
||||
- headset-codec
|
||||
- playback-codecs
|
||||
|
||||
# Disallow legacy properties if xxx-dai-link nodes are specified
|
||||
if:
|
||||
not:
|
||||
patternProperties:
|
||||
".*-dai-link$": false
|
||||
then:
|
||||
properties:
|
||||
headset-codec: false
|
||||
speaker-codecs: false
|
||||
|
||||
examples:
|
||||
- |
|
||||
|
||||
sound: mt8186-sound {
|
||||
compatible = "mediatek,mt8186-mt6366-da7219-max98357-sound";
|
||||
mediatek,platform = <&afe>;
|
||||
model = "mt8186_da7219_m98357";
|
||||
pinctrl-names = "aud_clk_mosi_off",
|
||||
"aud_clk_mosi_on";
|
||||
pinctrl-0 = <&aud_clk_mosi_off>;
|
||||
pinctrl-1 = <&aud_clk_mosi_on>;
|
||||
mediatek,platform = <&afe>;
|
||||
|
||||
headset-codec {
|
||||
sound-dai = <&da7219>;
|
||||
audio-routing =
|
||||
"Headphones", "HPL",
|
||||
"Headphones", "HPR",
|
||||
"MIC", "Headset Mic",
|
||||
"Speakers", "Speaker",
|
||||
"HDMI1", "TX";
|
||||
|
||||
hs-playback-dai-link {
|
||||
link-name = "I2S0";
|
||||
dai-format = "i2s";
|
||||
mediatek,clk-provider = "cpu";
|
||||
codec {
|
||||
sound-dai = <&da7219>;
|
||||
};
|
||||
};
|
||||
|
||||
playback-codecs {
|
||||
sound-dai = <&anx_bridge_dp>,
|
||||
<&max98357a>;
|
||||
hs-capture-dai-link {
|
||||
link-name = "I2S1";
|
||||
dai-format = "i2s";
|
||||
mediatek,clk-provider = "cpu";
|
||||
codec {
|
||||
sound-dai = <&da7219>;
|
||||
};
|
||||
};
|
||||
|
||||
spk-dp-playback-dai-link {
|
||||
link-name = "I2S3";
|
||||
dai-format = "i2s";
|
||||
mediatek,clk-provider = "cpu";
|
||||
codec {
|
||||
sound-dai = <&anx_bridge_dp>, <&max98357a>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -12,6 +12,9 @@ maintainers:
|
|||
description:
|
||||
This binding describes the MT8186 sound card.
|
||||
|
||||
allOf:
|
||||
- $ref: sound-card-common.yaml#
|
||||
|
||||
properties:
|
||||
compatible:
|
||||
enum:
|
||||
|
|
@ -19,6 +22,34 @@ properties:
|
|||
- mediatek,mt8186-mt6366-rt5682s-max98360-sound
|
||||
- mediatek,mt8186-mt6366-rt5650-sound
|
||||
|
||||
audio-routing:
|
||||
$ref: /schemas/types.yaml#/definitions/non-unique-string-array
|
||||
description:
|
||||
A list of the connections between audio components. Each entry is a
|
||||
pair of strings, the first being the connection's sink, the second
|
||||
being the connection's source.
|
||||
Valid names could be the input or output widgets of audio components,
|
||||
power supplies, MicBias of codec and the software switch.
|
||||
minItems: 2
|
||||
items:
|
||||
enum:
|
||||
# Sinks
|
||||
- HDMI1
|
||||
- Headphone
|
||||
- IN1P
|
||||
- IN1N
|
||||
- Line Out
|
||||
- Speakers
|
||||
|
||||
# Sources
|
||||
- Headset Mic
|
||||
- HPOL
|
||||
- HPOR
|
||||
- Speaker
|
||||
- SPOL
|
||||
- SPOR
|
||||
- TX
|
||||
|
||||
mediatek,platform:
|
||||
$ref: /schemas/types.yaml#/definitions/phandle
|
||||
description: The phandle of MT8186 ASoC platform.
|
||||
|
|
@ -32,6 +63,7 @@ properties:
|
|||
|
||||
headset-codec:
|
||||
type: object
|
||||
deprecated: true
|
||||
additionalProperties: false
|
||||
properties:
|
||||
sound-dai:
|
||||
|
|
@ -41,6 +73,7 @@ properties:
|
|||
|
||||
playback-codecs:
|
||||
type: object
|
||||
deprecated: true
|
||||
additionalProperties: false
|
||||
properties:
|
||||
sound-dai:
|
||||
|
|
@ -62,13 +95,56 @@ properties:
|
|||
A list of the desired dai-links in the sound card. Each entry is a
|
||||
name defined in the machine driver.
|
||||
|
||||
additionalProperties: false
|
||||
patternProperties:
|
||||
".*-dai-link$":
|
||||
type: object
|
||||
additionalProperties: false
|
||||
description:
|
||||
Container for dai-link level properties and CODEC sub-nodes.
|
||||
|
||||
properties:
|
||||
link-name:
|
||||
description: Indicates dai-link name and PCM stream name
|
||||
enum: [ I2S0, I2S1, I2S2, I2S3 ]
|
||||
|
||||
codec:
|
||||
description: Holds subnode which indicates codec dai.
|
||||
type: object
|
||||
additionalProperties: false
|
||||
properties:
|
||||
sound-dai:
|
||||
minItems: 1
|
||||
maxItems: 2
|
||||
required:
|
||||
- sound-dai
|
||||
|
||||
dai-format:
|
||||
description: audio format
|
||||
enum: [ i2s, right_j, left_j, dsp_a, dsp_b ]
|
||||
|
||||
mediatek,clk-provider:
|
||||
$ref: /schemas/types.yaml#/definitions/string
|
||||
description: Indicates dai-link clock master.
|
||||
enum: [ cpu, codec ]
|
||||
|
||||
required:
|
||||
- link-name
|
||||
|
||||
unevaluatedProperties: false
|
||||
|
||||
required:
|
||||
- compatible
|
||||
- mediatek,platform
|
||||
- headset-codec
|
||||
- playback-codecs
|
||||
|
||||
# Disallow legacy properties if xxx-dai-link nodes are specified
|
||||
if:
|
||||
not:
|
||||
patternProperties:
|
||||
".*-dai-link$": false
|
||||
then:
|
||||
properties:
|
||||
headset-codec: false
|
||||
speaker-codecs: false
|
||||
|
||||
examples:
|
||||
- |
|
||||
|
|
@ -76,23 +152,49 @@ examples:
|
|||
|
||||
sound: mt8186-sound {
|
||||
compatible = "mediatek,mt8186-mt6366-rt1019-rt5682s-sound";
|
||||
mediatek,platform = <&afe>;
|
||||
model = "mt8186_rt1019_rt5682s";
|
||||
pinctrl-names = "aud_clk_mosi_off",
|
||||
"aud_clk_mosi_on",
|
||||
"aud_gpio_dmic_sec";
|
||||
pinctrl-0 = <&aud_clk_mosi_off>;
|
||||
pinctrl-1 = <&aud_clk_mosi_on>;
|
||||
pinctrl-2 = <&aud_gpio_dmic_sec>;
|
||||
mediatek,platform = <&afe>;
|
||||
|
||||
dmic-gpios = <&pio 23 GPIO_ACTIVE_HIGH>;
|
||||
|
||||
headset-codec {
|
||||
sound-dai = <&rt5682s>;
|
||||
audio-routing =
|
||||
"Headphone", "HPOL",
|
||||
"Headphone", "HPOR",
|
||||
"IN1P", "Headset Mic",
|
||||
"Speakers", "Speaker",
|
||||
"HDMI1", "TX";
|
||||
|
||||
hs-playback-dai-link {
|
||||
link-name = "I2S0";
|
||||
dai-format = "i2s";
|
||||
mediatek,clk-provider = "cpu";
|
||||
codec {
|
||||
sound-dai = <&rt5682s 0>;
|
||||
};
|
||||
};
|
||||
|
||||
playback-codecs {
|
||||
sound-dai = <&it6505dptx>,
|
||||
<&rt1019p>;
|
||||
hs-capture-dai-link {
|
||||
link-name = "I2S1";
|
||||
dai-format = "i2s";
|
||||
mediatek,clk-provider = "cpu";
|
||||
codec {
|
||||
sound-dai = <&rt5682s 0>;
|
||||
};
|
||||
};
|
||||
|
||||
spk-hdmi-playback-dai-link {
|
||||
link-name = "I2S3";
|
||||
dai-format = "i2s";
|
||||
mediatek,clk-provider = "cpu";
|
||||
codec {
|
||||
sound-dai = <&it6505dptx>, <&rt1019p>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue