From nobody Thu Nov 14 16:28:01 2024 Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 35AC615CD4C; Tue, 16 Apr 2024 07:14:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.235.227.194 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713251699; cv=none; b=KR/DLoAjZm0RwMtIXAqryJ6Mq1ncXi8A0fEmHbMQJeGb3yyd4rMMfNcta9u5+jB/Bq7UiX3+WNBNQeZATqIqUtbiULhCJAkKep06P0drjVHwMvWoPLhWzI7easiEcjyLmOy/affBg8BMSJKv9EnFDSAg7i4opTMDLyxiL6BToBQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713251699; c=relaxed/simple; bh=0Xu+A6DQSApUl+bx7dqAi1yjwT+TMZd9+xG6pwiMVK4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=J6ioOo0EoGogxZutNvecRnTAMEo5vJNZBAiqCO6cMkEn5QfkBmRCfSxYIdeID34fPJhfatFnmlZshXh/H9lBhpQlAPDGVNAo97CwCuYv2fGONNwC16wvDjL1+6FZCpGKfnR5AJpGnUD4DdYXXDBcGcBVInJQ8BG4VbCa7puBqXM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=eQjwEv6Z; arc=none smtp.client-ip=46.235.227.194 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="eQjwEv6Z" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1713251696; bh=0Xu+A6DQSApUl+bx7dqAi1yjwT+TMZd9+xG6pwiMVK4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eQjwEv6ZWzF9Ay/bg3H0wAkkjqZxasipdTIvYhVpZ/etz69slrDOawj+7rLe8leTi jhzD9FWjwOfwIW9vbN+3QZg+fY5Evgcy4u2QB53qzjh5ZsrPiNhy2pWUjj22RNYgAg iu4HJ2tfwWJ0AOOMApNLzKOeN3klv1Ovo9FZswp37jYEE+ua1uG7zjIaWGxtMQYlPX u5KvZVSK9sOg6yo7M9AeJrux48r7Mfm1g+F3jEYFMyg90ljJNnn+f9q0Iuu5jKCG4A Sfod7S2Ci1MsL2hX0QaguHQ5Ai2L7ItQUsJuAmkcjpj7P2uofiVw5QO6/C5sYHsNXs Sv/8uxymKcpEg== Received: from IcarusMOD.eternityproject.eu (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: kholk11) by madrid.collaboradmins.com (Postfix) with ESMTPSA id 71226378210B; Tue, 16 Apr 2024 07:14:54 +0000 (UTC) From: AngeloGioacchino Del Regno To: broonie@kernel.org Cc: wenst@chromium.org, lgirdwood@gmail.com, robh@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, matthias.bgg@gmail.com, perex@perex.cz, tiwai@suse.com, trevor.wu@mediatek.com, maso.huang@mediatek.com, xiazhengqiao@huaqin.corp-partner.google.com, arnd@arndb.de, kuninori.morimoto.gx@renesas.com, shraash@google.com, amergnat@baylibre.com, nicolas.ferre@microchip.com, u.kleine-koenig@pengutronix.de, dianders@chromium.org, frank.li@vivo.com, allen-kh.cheng@mediatek.com, eugen.hristev@collabora.com, claudiu.beznea@tuxon.dev, jarkko.nikula@bitmer.com, jiaxin.yu@mediatek.com, alpernebiyasak@gmail.com, ckeepax@opensource.cirrus.com, zhourui@huaqin.corp-partner.google.com, nfraprado@collabora.com, alsa-devel@alsa-project.org, shane.chien@mediatek.com, linux-sound@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, kernel@collabora.com, AngeloGioacchino Del Regno Subject: [PATCH v5 16/18] ASoC: dt-bindings: mt8186: Document audio-routing and dai-link subnode Date: Tue, 16 Apr 2024 09:14:08 +0200 Message-ID: <20240416071410.75620-17-angelogioacchino.delregno@collabora.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240416071410.75620-1-angelogioacchino.delregno@collabora.com> References: <20240416071410.75620-1-angelogioacchino.delregno@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Signed-off-by: AngeloGioacchino Del Regno --- .../sound/mt8186-mt6366-da7219-max98357.yaml | 131 ++++++++++++++++-- .../sound/mt8186-mt6366-rt1019-rt5682s.yaml | 120 ++++++++++++++-- 2 files changed, 233 insertions(+), 18 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/mt8186-mt6366-da7219-m= ax98357.yaml b/Documentation/devicetree/bindings/sound/mt8186-mt6366-da7219= -max98357.yaml index 9853c11a1330..cbc641ecbe94 100644 --- a/Documentation/devicetree/bindings/sound/mt8186-mt6366-da7219-max98357= .yaml +++ b/Documentation/devicetree/bindings/sound/mt8186-mt6366-da7219-max98357= .yaml @@ -12,17 +12,46 @@ maintainers: description: This binding describes the MT8186 sound card. =20 +allOf: + - $ref: sound-card-common.yaml# + properties: compatible: enum: - mediatek,mt8186-mt6366-da7219-max98357-sound =20 + 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. =20 headset-codec: type: object + deprecated: true additionalProperties: false properties: sound-dai: @@ -32,6 +61,7 @@ properties: =20 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. =20 -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 =20 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 =20 examples: - | =20 sound: mt8186-sound { compatible =3D "mediatek,mt8186-mt6366-da7219-max98357-sound"; - mediatek,platform =3D <&afe>; + model =3D "mt8186_da7219_m98357"; pinctrl-names =3D "aud_clk_mosi_off", "aud_clk_mosi_on"; pinctrl-0 =3D <&aud_clk_mosi_off>; pinctrl-1 =3D <&aud_clk_mosi_on>; + mediatek,platform =3D <&afe>; + + audio-routing =3D + "Headphones", "HPL", + "Headphones", "HPR", + "MIC", "Headset Mic", + "Speakers", "Speaker", + "HDMI1", "TX"; + + hs-playback-dai-link { + link-name =3D "I2S0"; + dai-format =3D "i2s"; + mediatek,clk-provider =3D "cpu"; + codec { + sound-dai =3D <&da7219>; + }; + }; =20 - headset-codec { - sound-dai =3D <&da7219>; + hs-capture-dai-link { + link-name =3D "I2S1"; + dai-format =3D "i2s"; + mediatek,clk-provider =3D "cpu"; + codec { + sound-dai =3D <&da7219>; + }; }; =20 - playback-codecs { - sound-dai =3D <&anx_bridge_dp>, - <&max98357a>; + spk-dp-playback-dai-link { + link-name =3D "I2S3"; + dai-format =3D "i2s"; + mediatek,clk-provider =3D "cpu"; + codec { + sound-dai =3D <&anx_bridge_dp>, <&max98357a>; + }; }; }; =20 diff --git a/Documentation/devicetree/bindings/sound/mt8186-mt6366-rt1019-r= t5682s.yaml b/Documentation/devicetree/bindings/sound/mt8186-mt6366-rt1019-= rt5682s.yaml index bdf7b0960533..ed93f18ef985 100644 --- a/Documentation/devicetree/bindings/sound/mt8186-mt6366-rt1019-rt5682s.= yaml +++ b/Documentation/devicetree/bindings/sound/mt8186-mt6366-rt1019-rt5682s.= yaml @@ -12,6 +12,9 @@ maintainers: description: This binding describes the MT8186 sound card. =20 +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 =20 + 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: =20 headset-codec: type: object + deprecated: true additionalProperties: false properties: sound-dai: @@ -41,6 +73,7 @@ properties: =20 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. =20 -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 =20 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 =20 examples: - | @@ -76,23 +152,49 @@ examples: =20 sound: mt8186-sound { compatible =3D "mediatek,mt8186-mt6366-rt1019-rt5682s-sound"; - mediatek,platform =3D <&afe>; + model =3D "mt8186_rt1019_rt5682s"; pinctrl-names =3D "aud_clk_mosi_off", "aud_clk_mosi_on", "aud_gpio_dmic_sec"; pinctrl-0 =3D <&aud_clk_mosi_off>; pinctrl-1 =3D <&aud_clk_mosi_on>; pinctrl-2 =3D <&aud_gpio_dmic_sec>; + mediatek,platform =3D <&afe>; =20 dmic-gpios =3D <&pio 23 GPIO_ACTIVE_HIGH>; =20 - headset-codec { - sound-dai =3D <&rt5682s>; + audio-routing =3D + "Headphone", "HPOL", + "Headphone", "HPOR", + "IN1P", "Headset Mic", + "Speakers", "Speaker", + "HDMI1", "TX"; + + hs-playback-dai-link { + link-name =3D "I2S0"; + dai-format =3D "i2s"; + mediatek,clk-provider =3D "cpu"; + codec { + sound-dai =3D <&rt5682s 0>; + }; + }; + + hs-capture-dai-link { + link-name =3D "I2S1"; + dai-format =3D "i2s"; + mediatek,clk-provider =3D "cpu"; + codec { + sound-dai =3D <&rt5682s 0>; + }; }; =20 - playback-codecs { - sound-dai =3D <&it6505dptx>, - <&rt1019p>; + spk-hdmi-playback-dai-link { + link-name =3D "I2S3"; + dai-format =3D "i2s"; + mediatek,clk-provider =3D "cpu"; + codec { + sound-dai =3D <&it6505dptx>, <&rt1019p>; + }; }; }; =20 --=20 2.44.0