From: "Martin Povišer" <povik+lin@cutebit.org> To: Liam Girdwood <lgirdwood@gmail.com>, Mark Brown <broonie@kernel.org>, Rob Herring <robh+dt@kernel.org>, Krzysztof Kozlowski <krzk+dt@kernel.org>, Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com> Cc: "Martin Povišer" <povik+lin@cutebit.org>, alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, "Mark Kettenis" <kettenis@openbsd.org>, "Hector Martin" <marcan@marcan.st>, "Sven Peter" <sven@svenpeter.dev>, asahi@lists.linux.dev Subject: [RFC PATCH v2 2/5] dt-bindings: sound: Add Apple Macs sound peripherals Date: Mon, 6 Jun 2022 21:19:07 +0200 [thread overview] Message-ID: <20220606191910.16580-3-povik+lin@cutebit.org> (raw) In-Reply-To: <20220606191910.16580-1-povik+lin@cutebit.org> Add binding for Apple Silicon Macs' machine-level integration of sound peripherals. Signed-off-by: Martin Povišer <povik+lin@cutebit.org> --- .../bindings/sound/apple,macaudio.yaml | 157 ++++++++++++++++++ 1 file changed, 157 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/apple,macaudio.yaml diff --git a/Documentation/devicetree/bindings/sound/apple,macaudio.yaml b/Documentation/devicetree/bindings/sound/apple,macaudio.yaml new file mode 100644 index 000000000000..f7c12697beab --- /dev/null +++ b/Documentation/devicetree/bindings/sound/apple,macaudio.yaml @@ -0,0 +1,157 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/apple,macaudio.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple Silicon Macs integrated sound peripherals + +description: | + This binding represents the overall machine-level integration of sound + peripherals on 'Apple Silicon' machines by Apple. + +maintainers: + - Martin Povišer <povik+lin@cutebit.org> + +properties: + compatible: + items: + - enum: + - apple,j274-macaudio + - apple,j293-macaudio + - apple,j314-macaudio + - const: apple,macaudio + + "#address-cells": + const: 1 + + "#size-cells": + const: 0 + + model: + description: | + Model name for presentation to users + $ref: /schemas/types.yaml#/definitions/string + +patternProperties: + "^dai-link(@[0-9a-f]+)?$": + description: | + Node for each sound peripheral such as the speaker array, headphones jack, + or microphone. + type: object + properties: + reg: + maxItems: 1 + + link-name: + description: | + Name for the peripheral, expecting 'Speaker' or 'Speakers' if this is + the speaker array. + $ref: /schemas/types.yaml#/definitions/string + + cpu: + type: object + properties: + sound-dai: + description: | + DAI list with CPU-side I2S ports involved in this peripheral. + minItems: 1 + maxItems: 2 + required: + - sound-dai + + codec: + type: object + properties: + sound-dai: + description: | + DAI list with the CODEC-side DAIs connected to the above CPU-side + DAIs and involved in this sound peripheral. + + The list is in left/right order if applicable. If there are more + than one CPU-side DAIs (there can be two), the CODECs must be + listed first those connected to the first CPU, then those + connected to the second. + + In addition, on some machines with many speaker codecs, the CODECs + are listed in this fixed order: + + J293: Left Front, Left Rear, Right Front, Right Rear + J314: Left Woofer 1, Left Tweeter, Left Woofer 2, + Right Woofer 1, Right Tweeter, Right Woofer 2 + minItems: 1 + maxItems: 8 + required: + - sound-dai + + required: + - reg + - cpu + - codec + + additionalProperties: false + +required: + - compatible + - model + +additionalProperties: false + +examples: + - | + mca: mca@9b600000 { + compatible = "apple,t6000-mca", "apple,mca"; + reg = <0x9b600000 0x10000>, + <0x9b500000 0x20000>; + + clocks = <&nco 0>, <&nco 1>, <&nco 2>, <&nco 3>; + power-domains = <&ps_audio_p>, <&ps_mca0>, <&ps_mca1>, + <&ps_mca2>, <&ps_mca3>; + dmas = <&admac 0>, <&admac 1>, <&admac 2>, <&admac 3>, + <&admac 4>, <&admac 5>, <&admac 6>, <&admac 7>, + <&admac 8>, <&admac 9>, <&admac 10>, <&admac 11>, + <&admac 12>, <&admac 13>, <&admac 14>, <&admac 15>; + dma-names = "tx0a", "rx0a", "tx0b", "rx0b", + "tx1a", "rx1a", "tx1b", "rx1b", + "tx2a", "rx2a", "tx2b", "rx2b", + "tx3a", "rx3a", "tx3b", "rx3b"; + + #sound-dai-cells = <1>; + }; + + sound { + compatible = "apple,j314-macaudio", "apple,macaudio"; + model = "MacBook Pro J314 integrated audio"; + + #address-cells = <1>; + #size-cells = <0>; + + dai-link@0 { + reg = <0>; + link-name = "Speakers"; + + cpu { + sound-dai = <&mca 0>, <&mca 1>; + }; + codec { + sound-dai = <&speaker_left_woof1>, + <&speaker_left_tweet>, + <&speaker_left_woof2>, + <&speaker_right_woof1>, + <&speaker_right_tweet>, + <&speaker_right_woof2>; + }; + }; + + dai-link@1 { + reg = <1>; + link-name = "Headphones Jack"; + + cpu { + sound-dai = <&mca 2>; + }; + codec { + sound-dai = <&jack_codec>; + }; + }; + }; -- 2.33.0
WARNING: multiple messages have this Message-ID (diff)
From: "Martin Povišer" <povik+lin@cutebit.org> To: Liam Girdwood <lgirdwood@gmail.com>, Mark Brown <broonie@kernel.org>, Rob Herring <robh+dt@kernel.org>, Krzysztof Kozlowski <krzk+dt@kernel.org>, Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com> Cc: devicetree@vger.kernel.org, alsa-devel@alsa-project.org, "Sven Peter" <sven@svenpeter.dev>, "Hector Martin" <marcan@marcan.st>, linux-kernel@vger.kernel.org, asahi@lists.linux.dev, "Mark Kettenis" <kettenis@openbsd.org>, "Martin Povišer" <povik+lin@cutebit.org> Subject: [RFC PATCH v2 2/5] dt-bindings: sound: Add Apple Macs sound peripherals Date: Mon, 6 Jun 2022 21:19:07 +0200 [thread overview] Message-ID: <20220606191910.16580-3-povik+lin@cutebit.org> (raw) In-Reply-To: <20220606191910.16580-1-povik+lin@cutebit.org> Add binding for Apple Silicon Macs' machine-level integration of sound peripherals. Signed-off-by: Martin Povišer <povik+lin@cutebit.org> --- .../bindings/sound/apple,macaudio.yaml | 157 ++++++++++++++++++ 1 file changed, 157 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/apple,macaudio.yaml diff --git a/Documentation/devicetree/bindings/sound/apple,macaudio.yaml b/Documentation/devicetree/bindings/sound/apple,macaudio.yaml new file mode 100644 index 000000000000..f7c12697beab --- /dev/null +++ b/Documentation/devicetree/bindings/sound/apple,macaudio.yaml @@ -0,0 +1,157 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/apple,macaudio.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple Silicon Macs integrated sound peripherals + +description: | + This binding represents the overall machine-level integration of sound + peripherals on 'Apple Silicon' machines by Apple. + +maintainers: + - Martin Povišer <povik+lin@cutebit.org> + +properties: + compatible: + items: + - enum: + - apple,j274-macaudio + - apple,j293-macaudio + - apple,j314-macaudio + - const: apple,macaudio + + "#address-cells": + const: 1 + + "#size-cells": + const: 0 + + model: + description: | + Model name for presentation to users + $ref: /schemas/types.yaml#/definitions/string + +patternProperties: + "^dai-link(@[0-9a-f]+)?$": + description: | + Node for each sound peripheral such as the speaker array, headphones jack, + or microphone. + type: object + properties: + reg: + maxItems: 1 + + link-name: + description: | + Name for the peripheral, expecting 'Speaker' or 'Speakers' if this is + the speaker array. + $ref: /schemas/types.yaml#/definitions/string + + cpu: + type: object + properties: + sound-dai: + description: | + DAI list with CPU-side I2S ports involved in this peripheral. + minItems: 1 + maxItems: 2 + required: + - sound-dai + + codec: + type: object + properties: + sound-dai: + description: | + DAI list with the CODEC-side DAIs connected to the above CPU-side + DAIs and involved in this sound peripheral. + + The list is in left/right order if applicable. If there are more + than one CPU-side DAIs (there can be two), the CODECs must be + listed first those connected to the first CPU, then those + connected to the second. + + In addition, on some machines with many speaker codecs, the CODECs + are listed in this fixed order: + + J293: Left Front, Left Rear, Right Front, Right Rear + J314: Left Woofer 1, Left Tweeter, Left Woofer 2, + Right Woofer 1, Right Tweeter, Right Woofer 2 + minItems: 1 + maxItems: 8 + required: + - sound-dai + + required: + - reg + - cpu + - codec + + additionalProperties: false + +required: + - compatible + - model + +additionalProperties: false + +examples: + - | + mca: mca@9b600000 { + compatible = "apple,t6000-mca", "apple,mca"; + reg = <0x9b600000 0x10000>, + <0x9b500000 0x20000>; + + clocks = <&nco 0>, <&nco 1>, <&nco 2>, <&nco 3>; + power-domains = <&ps_audio_p>, <&ps_mca0>, <&ps_mca1>, + <&ps_mca2>, <&ps_mca3>; + dmas = <&admac 0>, <&admac 1>, <&admac 2>, <&admac 3>, + <&admac 4>, <&admac 5>, <&admac 6>, <&admac 7>, + <&admac 8>, <&admac 9>, <&admac 10>, <&admac 11>, + <&admac 12>, <&admac 13>, <&admac 14>, <&admac 15>; + dma-names = "tx0a", "rx0a", "tx0b", "rx0b", + "tx1a", "rx1a", "tx1b", "rx1b", + "tx2a", "rx2a", "tx2b", "rx2b", + "tx3a", "rx3a", "tx3b", "rx3b"; + + #sound-dai-cells = <1>; + }; + + sound { + compatible = "apple,j314-macaudio", "apple,macaudio"; + model = "MacBook Pro J314 integrated audio"; + + #address-cells = <1>; + #size-cells = <0>; + + dai-link@0 { + reg = <0>; + link-name = "Speakers"; + + cpu { + sound-dai = <&mca 0>, <&mca 1>; + }; + codec { + sound-dai = <&speaker_left_woof1>, + <&speaker_left_tweet>, + <&speaker_left_woof2>, + <&speaker_right_woof1>, + <&speaker_right_tweet>, + <&speaker_right_woof2>; + }; + }; + + dai-link@1 { + reg = <1>; + link-name = "Headphones Jack"; + + cpu { + sound-dai = <&mca 2>; + }; + codec { + sound-dai = <&jack_codec>; + }; + }; + }; -- 2.33.0
next prev parent reply other threads:[~2022-06-06 19:20 UTC|newest] Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-06-06 19:19 [RFC PATCH v2 0/5] Apple Macs machine/platform ASoC driver Martin Povišer 2022-06-06 19:19 ` Martin Povišer 2022-06-06 19:19 ` [RFC PATCH v2 1/5] dt-bindings: sound: Add Apple MCA I2S transceiver Martin Povišer 2022-06-06 19:19 ` Martin Povišer 2022-06-06 19:44 ` Mark Brown 2022-06-06 19:44 ` Mark Brown 2022-06-09 18:44 ` Rob Herring 2022-06-09 18:44 ` Rob Herring 2022-06-06 19:19 ` Martin Povišer [this message] 2022-06-06 19:19 ` [RFC PATCH v2 2/5] dt-bindings: sound: Add Apple Macs sound peripherals Martin Povišer 2022-06-06 19:49 ` Mark Brown 2022-06-06 19:49 ` Mark Brown 2022-06-09 20:03 ` Rob Herring 2022-06-09 20:03 ` Rob Herring 2022-06-06 19:19 ` [RFC PATCH v2 3/5] ASoC: apple: Add MCA platform driver for Apple SoCs Martin Povišer 2022-06-06 19:19 ` Martin Povišer 2022-06-06 20:17 ` Mark Brown 2022-06-06 20:17 ` Mark Brown 2022-06-06 20:35 ` Martin Povišer 2022-06-06 20:35 ` Martin Povišer 2022-06-06 19:19 ` [RFC PATCH v2 4/5] ASoC: Introduce 'fixup_controls' card method Martin Povišer 2022-06-06 19:19 ` Martin Povišer 2022-06-06 19:19 ` [RFC PATCH v2 5/5] ASoC: apple: Add macaudio machine driver Martin Povišer 2022-06-06 19:19 ` Martin Povišer 2022-06-06 20:02 ` Pierre-Louis Bossart 2022-06-06 20:46 ` Martin Povišer 2022-06-06 20:46 ` Martin Povišer 2022-06-06 20:46 ` Martin Povišer 2022-06-06 21:22 ` Pierre-Louis Bossart 2022-06-06 21:22 ` Pierre-Louis Bossart 2022-06-06 21:33 ` Martin Povišer 2022-06-06 21:33 ` Martin Povišer 2022-06-06 21:33 ` Martin Povišer 2022-06-09 13:16 ` Mark Brown 2022-06-09 13:16 ` Mark Brown 2022-06-09 13:42 ` Martin Povišer 2022-06-09 13:42 ` Martin Povišer 2022-06-09 15:03 ` Mark Brown 2022-06-09 15:03 ` Mark Brown [not found] ` <2A0422B8-8367-457E-A146-730F7C3DE66B@cutebit.org> [not found] ` <YqIWtzphzVGmbIOe@sirena.org.uk> 2022-06-09 16:19 ` Martin Povišer 2022-06-09 16:19 ` Martin Povišer 2022-06-09 16:35 ` Mark Brown 2022-06-09 16:35 ` Mark Brown 2022-06-09 13:33 ` Mark Brown 2022-06-09 13:33 ` Mark Brown 2022-06-09 14:09 ` Martin Povišer 2022-06-09 14:09 ` Martin Povišer 2022-06-09 15:16 ` Mark Brown 2022-06-09 15:16 ` Mark Brown 2022-06-09 15:27 ` Martin Povišer 2022-06-09 15:27 ` Martin Povišer 2022-06-09 15:53 ` [RFC PATCH v2 0/5] Apple Macs machine/platform ASoC driver Mark Brown 2022-06-09 15:53 ` Mark Brown 2022-06-10 15:58 ` (subset) " Mark Brown 2022-06-10 15:58 ` Mark Brown
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220606191910.16580-3-povik+lin@cutebit.org \ --to=povik+lin@cutebit.org \ --cc=alsa-devel@alsa-project.org \ --cc=asahi@lists.linux.dev \ --cc=broonie@kernel.org \ --cc=devicetree@vger.kernel.org \ --cc=kettenis@openbsd.org \ --cc=krzk+dt@kernel.org \ --cc=lgirdwood@gmail.com \ --cc=linux-kernel@vger.kernel.org \ --cc=marcan@marcan.st \ --cc=perex@perex.cz \ --cc=robh+dt@kernel.org \ --cc=sven@svenpeter.dev \ --cc=tiwai@suse.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.