From: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> 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 <angelogioacchino.delregno@collabora.com> Subject: [PATCH v2 21/22] arm64: dts: mediatek: mt8195-cherry: Specify sound DAI links and routing Date: Thu, 7 Mar 2024 12:44:44 +0100 [thread overview] Message-ID: <20240307114445.196981-22-angelogioacchino.delregno@collabora.com> (raw) In-Reply-To: <20240307114445.196981-1-angelogioacchino.delregno@collabora.com> The drivers and bindings acquired support for specifying audio hardware and links in device tree: describe and link the sound related HW of this machine. Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> --- .../boot/dts/mediatek/mt8195-cherry.dtsi | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi b/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi index f94c07f8b933..e405e226e449 100644 --- a/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi @@ -240,6 +240,7 @@ adsp_device_mem: memory@60e80000 { spk_amplifier: rt1019p { compatible = "realtek,rt1019p"; label = "rt1019p"; + #sound-dai-cells = <0>; pinctrl-names = "default"; pinctrl-0 = <&rt1019p_pins_default>; sdb-gpios = <&pio 100 GPIO_ACTIVE_HIGH>; @@ -334,6 +335,7 @@ &disp_pwm0 { &dp_tx { status = "okay"; + #sound-dai-cells = <0>; pinctrl-names = "default"; pinctrl-0 = <&dptx_pin>; @@ -404,6 +406,7 @@ audio_codec: codec@1a { /* Realtek RT5682i or RT5682s, sharing the same configuration */ reg = <0x1a>; interrupts-extended = <&pio 89 IRQ_TYPE_EDGE_BOTH>; + #sound-dai-cells = <0>; realtek,jd-src = <1>; AVDD-supply = <&mt6359_vio18_ldo_reg>; @@ -1130,6 +1133,48 @@ &sound { "AFE_SOF_DL2", "AFE_SOF_DL3", "AFE_SOF_UL4", "AFE_SOF_UL5"; pinctrl-names = "default"; pinctrl-0 = <&aud_pins_default>; + + audio-routing = + "Headphone", "HPOL", + "Headphone", "HPOR", + "IN1P", "Headset Mic", + "Ext Spk", "Speaker"; + + mm-dai-link { + link-name = "ETDM1_IN_BE"; + mediatek,clk-provider = "cpu"; + }; + + hs-playback-dai-link { + link-name = "ETDM1_OUT_BE"; + mediatek,clk-provider = "cpu"; + codec { + sound-dai = <&audio_codec>; + }; + }; + + hs-capture-dai-link { + link-name = "ETDM2_IN_BE"; + mediatek,clk-provider = "cpu"; + codec { + sound-dai = <&audio_codec>; + }; + }; + + spk-playback-dai-link { + link-name = "ETDM2_OUT_BE"; + mediatek,clk-provider = "cpu"; + codec { + sound-dai = <&spk_amplifier>; + }; + }; + + displayport-dai-link { + link-name = "DPTX_BE"; + codec { + sound-dai = <&dp_tx>; + }; + }; }; &spi0 { -- 2.44.0
WARNING: multiple messages have this Message-ID (diff)
From: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> To: broonie@kernel.org Cc: shraash@google.com, alsa-devel@alsa-project.org, allen-kh.cheng@mediatek.com, kuninori.morimoto.gx@renesas.com, lgirdwood@gmail.com, tiwai@suse.com, shane.chien@mediatek.com, krzysztof.kozlowski+dt@linaro.org, claudiu.beznea@tuxon.dev, kernel@collabora.com, robh@kernel.org, nfraprado@collabora.com, amergnat@baylibre.com, zhourui@huaqin.corp-partner.google.com, jiaxin.yu@mediatek.com, trevor.wu@mediatek.com, wenst@chromium.org, devicetree@vger.kernel.org, conor+dt@kernel.org, ckeepax@opensource.cirrus.com, arnd@arndb.de, frank.li@vivo.com, maso.huang@mediatek.com, u.kleine-koenig@pengutronix.de, eugen.hristev@collabora.com, alpernebiyasak@gmail.com, linux-mediatek@lists.infradead.org, linux-sound@vger.kernel.org, matthias.bgg@gmail.com, perex@perex.cz, linux-arm-kernel@lists.infradead.org, AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>, xiazhengqiao@huaqin.corp-partner.google.com, dianders@chromium.org, linux-kernel@vger.kernel.org, jarkko.nikula@bitmer.com Subject: [PATCH v2 21/22] arm64: dts: mediatek: mt8195-cherry: Specify sound DAI links and routing Date: Thu, 7 Mar 2024 12:44:44 +0100 [thread overview] Message-ID: <20240307114445.196981-22-angelogioacchino.delregno@collabora.com> (raw) In-Reply-To: <20240307114445.196981-1-angelogioacchino.delregno@collabora.com> The drivers and bindings acquired support for specifying audio hardware and links in device tree: describe and link the sound related HW of this machine. Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> --- .../boot/dts/mediatek/mt8195-cherry.dtsi | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi b/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi index f94c07f8b933..e405e226e449 100644 --- a/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi @@ -240,6 +240,7 @@ adsp_device_mem: memory@60e80000 { spk_amplifier: rt1019p { compatible = "realtek,rt1019p"; label = "rt1019p"; + #sound-dai-cells = <0>; pinctrl-names = "default"; pinctrl-0 = <&rt1019p_pins_default>; sdb-gpios = <&pio 100 GPIO_ACTIVE_HIGH>; @@ -334,6 +335,7 @@ &disp_pwm0 { &dp_tx { status = "okay"; + #sound-dai-cells = <0>; pinctrl-names = "default"; pinctrl-0 = <&dptx_pin>; @@ -404,6 +406,7 @@ audio_codec: codec@1a { /* Realtek RT5682i or RT5682s, sharing the same configuration */ reg = <0x1a>; interrupts-extended = <&pio 89 IRQ_TYPE_EDGE_BOTH>; + #sound-dai-cells = <0>; realtek,jd-src = <1>; AVDD-supply = <&mt6359_vio18_ldo_reg>; @@ -1130,6 +1133,48 @@ &sound { "AFE_SOF_DL2", "AFE_SOF_DL3", "AFE_SOF_UL4", "AFE_SOF_UL5"; pinctrl-names = "default"; pinctrl-0 = <&aud_pins_default>; + + audio-routing = + "Headphone", "HPOL", + "Headphone", "HPOR", + "IN1P", "Headset Mic", + "Ext Spk", "Speaker"; + + mm-dai-link { + link-name = "ETDM1_IN_BE"; + mediatek,clk-provider = "cpu"; + }; + + hs-playback-dai-link { + link-name = "ETDM1_OUT_BE"; + mediatek,clk-provider = "cpu"; + codec { + sound-dai = <&audio_codec>; + }; + }; + + hs-capture-dai-link { + link-name = "ETDM2_IN_BE"; + mediatek,clk-provider = "cpu"; + codec { + sound-dai = <&audio_codec>; + }; + }; + + spk-playback-dai-link { + link-name = "ETDM2_OUT_BE"; + mediatek,clk-provider = "cpu"; + codec { + sound-dai = <&spk_amplifier>; + }; + }; + + displayport-dai-link { + link-name = "DPTX_BE"; + codec { + sound-dai = <&dp_tx>; + }; + }; }; &spi0 { -- 2.44.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2024-03-07 11:45 UTC|newest] Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top 2024-03-07 11:44 [PATCH v2 00/22] ASoC: Cleanup MediaTek soundcard machine drivers AngeloGioacchino Del Regno 2024-03-07 11:44 ` AngeloGioacchino Del Regno 2024-03-07 11:44 ` [PATCH v2 01/22] ASoC: mediatek: mt8192-afe-pcm: Convert to devm_pm_runtime_enable() AngeloGioacchino Del Regno 2024-03-07 11:44 ` AngeloGioacchino Del Regno 2024-03-07 11:44 ` [PATCH v2 02/22] ASoC: mediatek: mt8192-afe-pcm: Simplify with dev_err_probe() AngeloGioacchino Del Regno 2024-03-07 11:44 ` AngeloGioacchino Del Regno 2024-03-07 11:44 ` [PATCH v2 03/22] ASoC: mediatek: Commonize ADDA rate transform functions and enums AngeloGioacchino Del Regno 2024-03-07 11:44 ` AngeloGioacchino Del Regno 2024-03-07 11:44 ` [PATCH v2 04/22] ASoC: mediatek: Assign dummy when codec not specified for a DAI link AngeloGioacchino Del Regno 2024-03-07 11:44 ` AngeloGioacchino Del Regno 2024-03-07 11:44 ` [PATCH v2 05/22] ASoC: mediatek: Add common machine soundcard driver probe mechanism AngeloGioacchino Del Regno 2024-03-07 11:44 ` AngeloGioacchino Del Regno 2024-03-07 11:44 ` [PATCH v2 06/22] ASoC: mediatek: common: Constify struct mtk_sof_priv AngeloGioacchino Del Regno 2024-03-07 11:44 ` AngeloGioacchino Del Regno 2024-03-07 11:44 ` [PATCH v2 07/22] ASoC: mediatek: mt8188: Migrate to mtk_soundcard_common_probe AngeloGioacchino Del Regno 2024-03-07 11:44 ` AngeloGioacchino Del Regno 2024-03-07 11:44 ` [PATCH v2 08/22] ASoC: mediatek: mt8195: " AngeloGioacchino Del Regno 2024-03-07 11:44 ` AngeloGioacchino Del Regno 2024-03-07 11:44 ` [PATCH v2 09/22] ASoC: mediatek: mt8192: " AngeloGioacchino Del Regno 2024-03-07 11:44 ` AngeloGioacchino Del Regno 2024-03-07 11:44 ` [PATCH v2 10/22] ASoC: mediatek: mt8186: " AngeloGioacchino Del Regno 2024-03-07 11:44 ` AngeloGioacchino Del Regno 2024-03-07 11:44 ` [PATCH v2 11/22] ASoC: mediatek: Add common snd_soc_ops .startup() callback AngeloGioacchino Del Regno 2024-03-07 11:44 ` AngeloGioacchino Del Regno 2024-03-07 11:44 ` [PATCH v2 12/22] ASoC: mediatek: mt8195: Migrate to the common mtk_soundcard_startup AngeloGioacchino Del Regno 2024-03-07 11:44 ` AngeloGioacchino Del Regno 2024-03-07 11:44 ` [PATCH v2 13/22] ASoC: mediatek: mt8192: " AngeloGioacchino Del Regno 2024-03-07 11:44 ` AngeloGioacchino Del Regno 2024-03-07 11:44 ` [PATCH v2 14/22] ASoC: mediatek: mt8186-rt1019: " AngeloGioacchino Del Regno 2024-03-07 11:44 ` AngeloGioacchino Del Regno 2024-03-07 11:44 ` [PATCH v2 15/22] ASoC: mediatek: Add common mtk_afe_component_probe callback AngeloGioacchino Del Regno 2024-03-07 11:44 ` AngeloGioacchino Del Regno 2024-03-07 11:44 ` [PATCH v2 16/22] ASoC: mediatek: Use common mtk_afe_pcm_platform with common probe cb AngeloGioacchino Del Regno 2024-03-07 11:44 ` AngeloGioacchino Del Regno 2024-03-07 11:44 ` [PATCH v2 17/22] ASoC: mediatek: mt8186: Unify mt8186-mt6366 machine drivers AngeloGioacchino Del Regno 2024-03-07 11:44 ` AngeloGioacchino Del Regno 2024-03-07 11:44 ` [PATCH v2 18/22] ASoC: dt-bindings: mt8195: Document audio-routing and dai-link subnode AngeloGioacchino Del Regno 2024-03-07 11:44 ` AngeloGioacchino Del Regno 2024-03-07 11:44 ` [PATCH v2 19/22] ASoC: dt-bindings: mt8192: " AngeloGioacchino Del Regno 2024-03-07 11:44 ` AngeloGioacchino Del Regno 2024-03-07 13:38 ` Rob Herring 2024-03-07 13:38 ` Rob Herring 2024-03-07 14:12 ` Rob Herring 2024-03-07 14:12 ` Rob Herring 2024-03-08 8:35 ` AngeloGioacchino Del Regno 2024-03-08 8:35 ` AngeloGioacchino Del Regno 2024-03-07 11:44 ` [PATCH v2 20/22] ASoC: dt-bindings: mt8186: " AngeloGioacchino Del Regno 2024-03-07 11:44 ` AngeloGioacchino Del Regno 2024-03-07 13:38 ` Rob Herring 2024-03-07 13:38 ` Rob Herring 2024-03-07 11:44 ` AngeloGioacchino Del Regno [this message] 2024-03-07 11:44 ` [PATCH v2 21/22] arm64: dts: mediatek: mt8195-cherry: Specify sound DAI links and routing AngeloGioacchino Del Regno 2024-03-07 11:44 ` [PATCH v2 22/22] arm64: dts: mediatek: mt8186-corsola: " AngeloGioacchino Del Regno 2024-03-07 11:44 ` AngeloGioacchino Del Regno
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=20240307114445.196981-22-angelogioacchino.delregno@collabora.com \ --to=angelogioacchino.delregno@collabora.com \ --cc=allen-kh.cheng@mediatek.com \ --cc=alpernebiyasak@gmail.com \ --cc=alsa-devel@alsa-project.org \ --cc=amergnat@baylibre.com \ --cc=arnd@arndb.de \ --cc=broonie@kernel.org \ --cc=ckeepax@opensource.cirrus.com \ --cc=claudiu.beznea@tuxon.dev \ --cc=conor+dt@kernel.org \ --cc=devicetree@vger.kernel.org \ --cc=dianders@chromium.org \ --cc=eugen.hristev@collabora.com \ --cc=frank.li@vivo.com \ --cc=jarkko.nikula@bitmer.com \ --cc=jiaxin.yu@mediatek.com \ --cc=kernel@collabora.com \ --cc=krzysztof.kozlowski+dt@linaro.org \ --cc=kuninori.morimoto.gx@renesas.com \ --cc=lgirdwood@gmail.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mediatek@lists.infradead.org \ --cc=linux-sound@vger.kernel.org \ --cc=maso.huang@mediatek.com \ --cc=matthias.bgg@gmail.com \ --cc=nfraprado@collabora.com \ --cc=nicolas.ferre@microchip.com \ --cc=perex@perex.cz \ --cc=robh@kernel.org \ --cc=shane.chien@mediatek.com \ --cc=shraash@google.com \ --cc=tiwai@suse.com \ --cc=trevor.wu@mediatek.com \ --cc=u.kleine-koenig@pengutronix.de \ --cc=wenst@chromium.org \ --cc=xiazhengqiao@huaqin.corp-partner.google.com \ --cc=zhourui@huaqin.corp-partner.google.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.