| Message ID | 20240416071410.75620-19-angelogioacchino.delregno@collabora.com |
|---|---|
| State | Accepted |
| Commit | 458d92b55b87d2586d586f1e9ab010ce068dd14c |
| Headers | show |
| Series | ASoC: Cleanup MediaTek soundcard machine drivers | expand |
On Tue, Apr 16, 2024 at 3:15 PM AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> wrote: > > 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/mt8186-corsola.dtsi | 42 ++++++++++++++++--- > 1 file changed, 37 insertions(+), 5 deletions(-) > > diff --git a/arch/arm64/boot/dts/mediatek/mt8186-corsola.dtsi b/arch/arm64/boot/dts/mediatek/mt8186-corsola.dtsi > index 1807e9d6cb0e..afdab5724eaa 100644 > --- a/arch/arm64/boot/dts/mediatek/mt8186-corsola.dtsi > +++ b/arch/arm64/boot/dts/mediatek/mt8186-corsola.dtsi > @@ -42,7 +42,7 @@ backlight_lcd0: backlight-lcd0 { > default-brightness-level = <576>; > }; > > - bt-sco-codec { > + bt-sco { I remember changing this node from "bt-sco" to "bt-sco-codec" because of a review comment when I submitted the Corsola dts series. > compatible = "linux,bt-sco"; > #sound-dai-cells = <0>; > }; > @@ -223,12 +223,44 @@ sound: sound { > mediatek,adsp = <&adsp>; > mediatek,platform = <&afe>; > > - playback-codecs { > - sound-dai = <&it6505dptx>, <&rt1019p>; > + 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>; > + }; > + }; > + > + hs-capture-dai-link { > + link-name = "I2S1"; > + dai-format = "i2s"; > + mediatek,clk-provider = "cpu"; > + codec { > + sound-dai = <&rt5682s 0>; > + }; > }; > > - headset-codec { > - sound-dai = <&rt5682s 0>; > + spk-share-dai-link { > + link-name = "I2S2"; > + mediatek,clk-provider = "cpu"; > + }; > + > + spk-hdmi-playback-dai-link { > + link-name = "I2S3"; > + dai-format = "i2s"; > + mediatek,clk-provider = "cpu"; > + /* RT1019P and IT6505 connected to the same I2S line */ > + codec { > + sound-dai = <&it6505dptx>, <&rt1019p>; > + }; > }; > }; > > -- > 2.44.0 >
diff --git a/arch/arm64/boot/dts/mediatek/mt8186-corsola.dtsi b/arch/arm64/boot/dts/mediatek/mt8186-corsola.dtsi index 1807e9d6cb0e..afdab5724eaa 100644 --- a/arch/arm64/boot/dts/mediatek/mt8186-corsola.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8186-corsola.dtsi @@ -42,7 +42,7 @@ backlight_lcd0: backlight-lcd0 { default-brightness-level = <576>; }; - bt-sco-codec { + bt-sco { compatible = "linux,bt-sco"; #sound-dai-cells = <0>; }; @@ -223,12 +223,44 @@ sound: sound { mediatek,adsp = <&adsp>; mediatek,platform = <&afe>; - playback-codecs { - sound-dai = <&it6505dptx>, <&rt1019p>; + 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>; + }; + }; + + hs-capture-dai-link { + link-name = "I2S1"; + dai-format = "i2s"; + mediatek,clk-provider = "cpu"; + codec { + sound-dai = <&rt5682s 0>; + }; }; - headset-codec { - sound-dai = <&rt5682s 0>; + spk-share-dai-link { + link-name = "I2S2"; + mediatek,clk-provider = "cpu"; + }; + + spk-hdmi-playback-dai-link { + link-name = "I2S3"; + dai-format = "i2s"; + mediatek,clk-provider = "cpu"; + /* RT1019P and IT6505 connected to the same I2S line */ + codec { + sound-dai = <&it6505dptx>, <&rt1019p>; + }; }; };
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/mt8186-corsola.dtsi | 42 ++++++++++++++++--- 1 file changed, 37 insertions(+), 5 deletions(-)