[][Add mt7981 sound node and update clock src]
[Description]
Add mt7981 sound node and update clock src
[Release-log]
N/A
Change-Id: I1299522161abec1da52b198dc71f843c7a18ecf9
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/5455518
diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-spim-nand-rfb.dts b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-spim-nand-rfb.dts
index 6333507..ce76a6b 100755
--- a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-spim-nand-rfb.dts
+++ b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-spim-nand-rfb.dts
@@ -55,11 +55,22 @@
};
};
- sound {
+ sound_wm8960 {
+ compatible = "mediatek,mt79xx-wm8960-machine";
+ mediatek,platform = <&afe>;
+ audio-routing = "Headphone", "HP_L",
+ "Headphone", "HP_R",
+ "LINPUT1", "AMIC",
+ "RINPUT1", "AMIC";
+ mediatek,audio-codec = <&wm8960>;
+ status = "disabled";
+ };
+
+ sound_si3218x {
compatible = "mediatek,mt79xx-si3218x-machine";
mediatek,platform = <&afe>;
mediatek,ext-codec = <&proslic_spi>;
- status = "okay";
+ status = "disabled";
};
};
@@ -72,7 +83,7 @@
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c_pins>;
- status = "okay";
+ status = "disabled";
wm8960: wm8960@1a {
compatible = "wlf,wm8960";
diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981.dtsi b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981.dtsi
index 4e292da..e17c78f 100644
--- a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981.dtsi
+++ b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981.dtsi
@@ -341,7 +341,7 @@
clocks = <&topckgen CK_TOP_EIP97B>;
clock-names = "top_eip97_ck";
assigned-clocks = <&topckgen CK_TOP_EIP97B_SEL>;
- assigned-clock-parents = <&topckgen CK_TOP_CB_CKSQ_40M>;
+ assigned-clock-parents = <&topckgen CK_TOP_CB_NET1_D5>;
};
pio: pinctrl@11d00000 {
@@ -620,20 +620,22 @@
<&infracfg_ao CK_INFRA_AUD_26M_CK>,
<&infracfg_ao CK_INFRA_AUD_L_CK>,
<&infracfg_ao CK_INFRA_AUD_AUD_CK>,
- <&infracfg_ao CK_INFRA_AUD_EG2_CK>;
+ <&infracfg_ao CK_INFRA_AUD_EG2_CK>,
+ <&topckgen CK_TOP_AUD_SEL>;
clock-names = "aud_bus_ck",
"aud_26m_ck",
"aud_l_ck",
"aud_aud_ck",
- "aud_eg2_ck";
+ "aud_eg2_ck",
+ "aud_sel";
assigned-clocks = <&topckgen CK_TOP_AUD_SEL>,
<&topckgen CK_TOP_A1SYS_SEL>,
<&topckgen CK_TOP_AUD_L_SEL>,
<&topckgen CK_TOP_A_TUNER_SEL>;
- assigned-clock-parents = <&topckgen CK_TOP_CB_CKSQ_40M>,
- <&topckgen CK_TOP_CB_CKSQ_40M>,
- <&topckgen CK_TOP_CB_CKSQ_40M>,
- <&topckgen CK_TOP_CB_CKSQ_40M>;
+ assigned-clock-parents = <&topckgen CK_TOP_CB_APLL2_196M>,
+ <&topckgen CK_TOP_APLL2_D4>,
+ <&topckgen CK_TOP_CB_APLL2_196M>,
+ <&topckgen CK_TOP_APLL2_D4>;
status = "disabled";
};