diff mbox series

[3/5] arm64: dts: mediatek: Add dtsi files to use rt5682s on mt8192

Message ID 20230211002626.454844-4-nfraprado@collabora.com (mailing list archive)
State New, archived
Headers show
Series arm64: dts: mediatek: Add newer revisions of Google Spherion and Hayato | expand

Commit Message

Nícolas F. R. A. Prado Feb. 11, 2023, 12:26 a.m. UTC
Add a dtsi file for the rt5682s audio codec and another to wire it to be
used by mt8192's sound card.

These dtsi files will be used by Spherion rev4 and Hayato rev5-sku2,
which make use of the rt5682s codec instead of the rt5682 used in
previous revisions.

Signed-off-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
---

 .../mt8192-asurada-audio-rt1015p-rt5682s.dtsi | 18 ++++++++++++++++++
 .../mt8192-asurada-audio-rt5682s.dtsi         | 19 +++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 arch/arm64/boot/dts/mediatek/mt8192-asurada-audio-rt1015p-rt5682s.dtsi
 create mode 100644 arch/arm64/boot/dts/mediatek/mt8192-asurada-audio-rt5682s.dtsi

Comments

AngeloGioacchino Del Regno Feb. 14, 2023, 10:25 a.m. UTC | #1
Il 11/02/23 01:26, Nícolas F. R. A. Prado ha scritto:
> Add a dtsi file for the rt5682s audio codec and another to wire it to be
> used by mt8192's sound card.
> 
> These dtsi files will be used by Spherion rev4 and Hayato rev5-sku2,
> which make use of the rt5682s codec instead of the rt5682 used in
> previous revisions.
> 

I think we're getting too many -audio-x devicetrees here... it's getting somehow
strange: imagine if we had 4 xxxx-audio-xxxx.dtsi for all of the supported
machines in dts/mediatek... that'd be at least *40* more files and would grow at
a quite fast pace. Too much IMO.

Check how I've done it in mt8195-cherry.dtsi, mt8195-cherry-tomato-r{1,2,3}.dts:
I didn't even have to add any mt8195-cherry-audio-xxxx.dtsi.

I understand your reasons for doing that - reducing duplication - but, in my
opinion, duplicating just 3 lines for 4 times is the way to go...
If those 4 files were used in *most MediaTek devicetrees* instead of one single
project, I'd agree with you though :-)

If you can come up with anything better than what I propose... I'd be even happier!

Cheers,
Angelo
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/mediatek/mt8192-asurada-audio-rt1015p-rt5682s.dtsi b/arch/arm64/boot/dts/mediatek/mt8192-asurada-audio-rt1015p-rt5682s.dtsi
new file mode 100644
index 000000000000..8921f5e38586
--- /dev/null
+++ b/arch/arm64/boot/dts/mediatek/mt8192-asurada-audio-rt1015p-rt5682s.dtsi
@@ -0,0 +1,18 @@ 
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Copyright (C) 2022 MediaTek Inc.
+ */
+#include "mt8192-asurada-audio-rt5682s.dtsi"
+#include "mt8192-asurada-audio-rt1015p.dtsi"
+
+&sound {
+	compatible = "mediatek,mt8192_mt6359_rt1015p_rt5682s";
+
+	speaker-codecs {
+		sound-dai = <&rt1015p>;
+	};
+
+	headset-codec {
+		sound-dai = <&rt5682s 0>;
+	};
+};
diff --git a/arch/arm64/boot/dts/mediatek/mt8192-asurada-audio-rt5682s.dtsi b/arch/arm64/boot/dts/mediatek/mt8192-asurada-audio-rt5682s.dtsi
new file mode 100644
index 000000000000..919035245b6e
--- /dev/null
+++ b/arch/arm64/boot/dts/mediatek/mt8192-asurada-audio-rt5682s.dtsi
@@ -0,0 +1,19 @@ 
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Copyright (C) 2022 MediaTek Inc.
+ */
+
+&i2c1 {
+	rt5682s: audio-codec@1a {
+		compatible = "realtek,rt5682s";
+		reg = <0x1a>;
+		interrupts-extended = <&pio 18 IRQ_TYPE_LEVEL_LOW>;
+		realtek,jd-src = <1>;
+		#sound-dai-cells = <1>;
+
+		AVDD-supply = <&mt6359_vio18_ldo_reg>;
+		DBVDD-supply = <&mt6359_vio18_ldo_reg>;
+		LDO1-IN-supply = <&mt6359_vio18_ldo_reg>;
+		MICVDD-supply = <&pp3300_g>;
+	};
+};