From nobody Fri Sep 20 03:40:13 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 5266314EFE2; Tue, 27 Feb 2024 12:10:58 +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=1709035860; cv=none; b=WOuc5qLQt1hhFUiZVyb57W/ut6Lw5BtEF38pRw0mb0EBBvczjWBRLBFM3Qv78WnYkaI8TEv1y35+bJgpHMLTOdgUqJ2aH3x9LAG1cXmge3VKZh5zOF/gEWPTYJleZFKgSrtLhVHhWzMNwbt8HMQuarmU2pU1Jf1YLAFGjzVbNCE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709035860; c=relaxed/simple; bh=FpZkwYdVfTF+bMDobFvJQk2yvXp+Z6trPflZm3oUlZM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YF4AaOMF8Awn69boCTrd1RaOyegnAyifXBrGV0jE3upo8bELddUzJxVN7JKG4R5GoRsc0PjI6i1Ie5iTMqKuv4m2R9A2CG/3yR4ZBamRZ3HOn+fWFNaUKRGt91Sb0Ep1gaKQkQxch2379RbnXGe5ThVB3CndlE7jpDXeJST/lVU= 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=MhrmIBZL; 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="MhrmIBZL" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1709035856; bh=FpZkwYdVfTF+bMDobFvJQk2yvXp+Z6trPflZm3oUlZM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MhrmIBZLuCengucGyVl5DGZeBRydUYfybL6TrY4t6sGpxblPW+mvRL19oezNk+jKk 46ghplWyhBYbjSefmsDbsOwfDzfePMAyUbfrvdX0891mgBiwgOVhqgc+FZvULUw+2Y tdLypUTgv2LLXSKMvgLgyZyBqVzVZrs3juZA0U0iqWrcYjKNi+ppf1emP8dxrARRkO 2mG6T1wg1MftZZZhJGKPwc9fcwbmSziaQ7AtqEnsqu9dqIGLDNSu4S3MSzSsRsr8KH 45RfU4PAr3E48BVj4MAa0tLm3IWDfLYalbp+W/az/Fow8/6epWSeA+dl/OL0uMgq/c oeWtYrhmwuC1g== 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 A78BE37820ED; Tue, 27 Feb 2024 12:10: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 19/22] ASoC: dt-bindings: mt8192: Document audio-routing and dai-link subnode Date: Tue, 27 Feb 2024 13:09:36 +0100 Message-ID: <20240227120939.290143-20-angelogioacchino.delregno@collabora.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240227120939.290143-1-angelogioacchino.delregno@collabora.com> References: <20240227120939.290143-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. Signed-off-by: AngeloGioacchino Del Regno --- .../sound/mt8192-mt6359-rt1015-rt5682.yaml | 129 ++++++++++++++++-- 1 file changed, 121 insertions(+), 8 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/mt8192-mt6359-rt1015-r= t5682.yaml b/Documentation/devicetree/bindings/sound/mt8192-mt6359-rt1015-r= t5682.yaml index 7e50f5d65c8f..78e221003750 100644 --- a/Documentation/devicetree/bindings/sound/mt8192-mt6359-rt1015-rt5682.y= aml +++ b/Documentation/devicetree/bindings/sound/mt8192-mt6359-rt1015-rt5682.y= aml @@ -20,6 +20,15 @@ properties: - mediatek,mt8192_mt6359_rt1015p_rt5682 - mediatek,mt8192_mt6359_rt1015p_rt5682s =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. + mediatek,platform: $ref: /schemas/types.yaml#/definitions/phandle description: The phandle of MT8192 ASoC platform. @@ -27,10 +36,12 @@ properties: mediatek,hdmi-codec: $ref: /schemas/types.yaml#/definitions/phandle description: The phandle of HDMI codec. + deprecated: true =20 headset-codec: type: object additionalProperties: false + deprecated: true =20 properties: sound-dai: @@ -41,6 +52,7 @@ properties: speaker-codecs: type: object additionalProperties: false + deprecated: true =20 properties: sound-dai: @@ -51,13 +63,83 @@ properties: required: - sound-dai =20 +patternProperties: + ".*-dai-link$": + type: object + 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 + - I2S4 + - I2S5 + - I2S6 + - I2S7 + - I2S8 + - I2S9 + - TDM + + 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 + + additionalProperties: false + + required: + - link-name + additionalProperties: false =20 required: - compatible - mediatek,platform - - headset-codec - - speaker-codecs + +allOf: + # Disallow dai-link-xxx nodes if the legacy properties are specified + - if: + patternProperties: + ".*-dai-link$": false + then: + required: + - headset-codec + - speaker-codecs + else: + properties: + headset-codec: false + speaker-codecs: false + mediatek,hdmi-codec: false =20 examples: - | @@ -65,19 +147,50 @@ examples: sound: mt8192-sound { compatible =3D "mediatek,mt8192_mt6359_rt1015_rt5682"; mediatek,platform =3D <&afe>; - mediatek,hdmi-codec =3D <&anx_bridge_dp>; 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>; =20 - headset-codec { - sound-dai =3D <&rt5682>; + audio-routing =3D + "Headphone Jack", "HPOL", + "Headphone Jack", "HPOR", + "IN1P", "Headset Mic", + "Speakers", "Speaker"; + + spk-playback-dai-link { + link-name =3D "I2S3"; + dai-format =3D "i2s"; + mediatek,clk-provider =3D "cpu"; + codec { + sound-dai =3D <&rt1015p>; + }; + }; + + hs-playback-dai-link { + link-name =3D "I2S8"; + dai-format =3D "i2s"; + mediatek,clk-provider =3D "cpu"; + codec { + sound-dai =3D <&rt5682 0>; + }; + }; + + hs-capture-dai-link { + link-name =3D "I2S9"; + dai-format =3D "i2s"; + mediatek,clk-provider =3D "cpu"; + codec { + sound-dai =3D <&rt5682 0>; + }; }; =20 - speaker-codecs { - sound-dai =3D <&rt1015_l>, - <&rt1015_r>; + displayport-dai-link { + link-name =3D "TDM"; + dai-format =3D "dsp_a"; + codec { + sound-dai =3D <&anx_bridge_dp>; + }; }; }; =20 --=20 2.44.0