Skip to content

Commit 55aa58d

Browse files
ldtsldts
committed
linux-yocto-dev: qcm6490: enable audio on rb3gen2
Enable audio on qcs6490-RB3Gen2 Signed-off-by: Jorge Ramirez-Ortiz <[email protected]>
1 parent b7b4f2f commit 55aa58d

6 files changed

+429
-0
lines changed

‎recipes-kernel/linux/linux-yocto-dev.bbappend‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@ SRC_URI:append:qcom = " \
1616
file://qcm6490-board-dts/0001-dt-bindings-clock-qcom-Add-compatible-for.patch \
1717
file://qcm6490-board-dts/0002-arm64-dts-qcom-qcm6490-idp-Update-the-LPASS.patch \
1818
file://qcm6490-board-dts/0003-arm64-dts-qcom-qcs6490-rb3gen2-Update-the-LPASS-audi.patch \
19+
file://qcm6490-board-dts/0001-arm64-dts-qcom-sc7280-Add-gpr-node.patch \
20+
file://qcm6490-board-dts/0002-arm64-dts-qcom-sc7280-Add-WSA-SoundWire-and-LPASS-su.patch \
21+
file://qcm6490-board-dts/0003-arm64-dts-qcom-qcs6490-rb3gen2-Modify-WSA-and-VA-mac.patch \
22+
file://qcm6490-board-dts/0004-arm64-dts-qcom-qcs6490-rb3gen2-add-WSA8830-speakers-.patch \
23+
file://qcm6490-board-dts/0005-arm64-dts-qcom-qcs6490-rb3gen2-Add-sound-card.patch \
1924
file://workarounds/0001-QCLINUX-arm64-dts-qcom-qcm6490-disable-sdhc1-for-ufs.patch \
2025
file://workarounds/0001-PENDING-arm64-dts-qcom-Remove-voltage-vote-support-f.patch \
2126
file://drivers/0003-PCI-Add-new-start_link-stop_link-function-ops.patch \

‎recipes-kernel/linux/linux-yocto-dev/qcm6490-board-dts/0001-arm64-dts-qcom-sc7280-Add-gpr-node.patch‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
From d917cb1baa4c2144317c3d38a3977c7e6dea9cf7 Mon Sep 17 00:00:00 2001
2+
From: Mohammad Rafi Shaik <[email protected]>
3+
Date: Mon, 17 Mar 2025 11:11:44 +0530
4+
Subject: [PATCH 1/5] arm64: dts: qcom: sc7280: Add gpr node
5+
6+
Add GPR node along with APM(Audio Process Manager) and PRM(Proxy
7+
resource Manager) audio services.
8+
9+
Signed-off-by: Mohammad Rafi Shaik <[email protected]>
10+
Co-developed-by: Prasad Kumpatla <[email protected]>
11+
Signed-off-by: Prasad Kumpatla <[email protected]>
12+
13+
Upstream-Status: Submitted [https://lore.kernel.org/linux-arm-msm/[email protected]/]
14+
---
15+
arch/arm64/boot/dts/qcom/sc7280.dtsi | 37 ++++++++++++++++++++++++++++
16+
1 file changed, 37 insertions(+)
17+
18+
diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi
19+
index 7c4f48783656..4ec39782f772 100644
20+
--- a/arch/arm64/boot/dts/qcom/sc7280.dtsi
21+
+++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi
22+
@@ -25,6 +25,8 @@
23+
#include <dt-bindings/reset/qcom,sdm845-aoss.h>
24+
#include <dt-bindings/reset/qcom,sdm845-pdc.h>
25+
#include <dt-bindings/soc/qcom,apr.h>
26+
+#include <dt-bindings/soc/qcom,gpr.h>
27+
+#include <dt-bindings/sound/qcom,q6dsp-lpass-ports.h>
28+
#include <dt-bindings/soc/qcom,rpmh-rsc.h>
29+
#include <dt-bindings/sound/qcom,lpass.h>
30+
#include <dt-bindings/thermal/thermal.h>
31+
@@ -3865,6 +3867,41 @@ q6routing: routing {
32+
};
33+
};
34+
35+
+ gpr {
36+
+ compatible = "qcom,gpr";
37+
+ qcom,glink-channels = "adsp_apps";
38+
+ qcom,domain = <GPR_DOMAIN_ID_ADSP>;
39+
+ qcom,intents = <512 20>;
40+
+ #address-cells = <1>;
41+
+ #size-cells = <0>;
42+
+
43+
+ q6apm: service@1 {
44+
+ compatible = "qcom,q6apm";
45+
+ reg = <GPR_APM_MODULE_IID>;
46+
+ #sound-dai-cells = <0>;
47+
+
48+
+ q6apmdai: dais {
49+
+ compatible = "qcom,q6apm-dais";
50+
+ iommus = <&apps_smmu 0x1801 0x0>;
51+
+ };
52+
+
53+
+ q6apmbedai: bedais {
54+
+ compatible = "qcom,q6apm-lpass-dais";
55+
+ #sound-dai-cells = <1>;
56+
+ };
57+
+ };
58+
+
59+
+ q6prm: service@2 {
60+
+ compatible = "qcom,q6prm";
61+
+ reg = <GPR_PRM_MODULE_IID>;
62+
+
63+
+ q6prmcc: clock-controller {
64+
+ compatible = "qcom,q6prm-lpass-clocks";
65+
+ #clock-cells = <2>;
66+
+ };
67+
+ };
68+
+ };
69+
+
70+
fastrpc {
71+
compatible = "qcom,fastrpc";
72+
qcom,glink-channels = "fastrpcglink-apps-dsp";
73+
--
74+
2.34.1
75+

‎recipes-kernel/linux/linux-yocto-dev/qcm6490-board-dts/0002-arm64-dts-qcom-sc7280-Add-WSA-SoundWire-and-LPASS-su.patch‎

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
From edafdd4685bf195d72396dfac5c1578204314e55 Mon Sep 17 00:00:00 2001
2+
From: Mohammad Rafi Shaik <[email protected]>
3+
Date: Mon, 17 Mar 2025 11:11:45 +0530
4+
Subject: [PATCH 2/5] arm64: dts: qcom: sc7280: Add WSA SoundWire and LPASS
5+
support
6+
7+
Add WSA macroLPASS Codecs along with SoundWire controller.
8+
9+
Signed-off-by: Mohammad Rafi Shaik <[email protected]>
10+
Co-developed-by: Prasad Kumpatla <[email protected]>
11+
Signed-off-by: Prasad Kumpatla <[email protected]>
12+
Upstream-Status: Submitted [https://lore.kernel.org/linux-arm-msm/[email protected]/]
13+
---
14+
arch/arm64/boot/dts/qcom/sc7280.dtsi | 68 ++++++++++++++++++++++++++++
15+
1 file changed, 68 insertions(+)
16+
17+
diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi
18+
index 4ec39782f772..e8937c49a1e2 100644
19+
--- a/arch/arm64/boot/dts/qcom/sc7280.dtsi
20+
+++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi
21+
@@ -2610,6 +2610,64 @@ swr1: soundwire@3230000 {
22+
status = "disabled";
23+
};
24+
25+
+ lpass_wsa_macro: codec@3240000 {
26+
+ compatible = "qcom,sc7280-lpass-wsa-macro";
27+
+ reg = <0x0 0x03240000 0x0 0x1000>;
28+
+
29+
+ pinctrl-names = "default";
30+
+ pinctrl-0 = <&lpass_wsa_swr_clk>, <&lpass_wsa_swr_data>;
31+
+
32+
+ clocks = <&lpass_aon LPASS_AON_CC_TX_MCLK_CLK>,
33+
+ <&lpass_aon LPASS_AON_CC_TX_MCLK_2X_CLK>,
34+
+ <&lpass_va_macro>;
35+
+ clock-names = "mclk", "npl", "fsgen";
36+
+
37+
+ power-domains = <&lpass_hm LPASS_CORE_CC_LPASS_CORE_HM_GDSC>,
38+
+ <&lpass_aon LPASS_AON_CC_LPASS_AUDIO_HM_GDSC>;
39+
+ power-domain-names = "macro", "dcodec";
40+
+
41+
+ #clock-cells = <0>;
42+
+ clock-output-names = "mclk";
43+
+ #sound-dai-cells = <1>;
44+
+
45+
+ status = "disabled";
46+
+ };
47+
+
48+
+ swr2: soundwire@3250000 {
49+
+ compatible = "qcom,soundwire-v1.6.0";
50+
+ reg = <0x0 0x03250000 0x0 0x2000>;
51+
+
52+
+ interrupts = <GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>;
53+
+ clocks = <&lpass_wsa_macro>;
54+
+ clock-names = "iface";
55+
+
56+
+ qcom,din-ports = <2>;
57+
+ qcom,dout-ports = <6>;
58+
+
59+
+ resets = <&lpass_audiocc LPASS_AUDIO_SWR_WSA_CGCR>;
60+
+ reset-names = "swr_audio_cgcr";
61+
+
62+
+ qcom,ports-sinterval-low = /bits/ 8 <0x07 0x1f 0x3f 0x07
63+
+ 0x1f 0x3f 0x0f 0x0f>;
64+
+ qcom,ports-offset1 = /bits/ 8 <0x01 0x02 0x0c 0x06 0x12 0x0d 0x07 0x0a>;
65+
+ qcom,ports-offset2 = /bits/ 8 <0xff 0x00 0x1f 0xff 0x00 0x1f 0x00 0x00>;
66+
+ qcom,ports-hstart = /bits/ 8 <0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff>;
67+
+ qcom,ports-hstop = /bits/ 8 <0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff>;
68+
+ qcom,ports-word-length = /bits/ 8 <0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff>;
69+
+ qcom,ports-block-pack-mode = /bits/ 8 <0xff 0xff 0x01 0xff 0xff 0x01
70+
+ 0xff 0xff>;
71+
+ qcom,ports-block-group-count = /bits/ 8 <0xff 0xff 0xff 0xff 0xff 0xff
72+
+ 0xff 0xff>;
73+
+ qcom,ports-lane-control = /bits/ 8 <0xff 0xff 0xff 0xff 0xff 0xff
74+
+ 0xff 0xff>;
75+
+
76+
+ #address-cells = <2>;
77+
+ #size-cells = <0>;
78+
+ #sound-dai-cells = <1>;
79+
+
80+
+ status = "disabled";
81+
+ };
82+
+
83+
lpass_audiocc: clock-controller@3300000 {
84+
compatible = "qcom,sc7280-lpassaudiocc";
85+
reg = <0 0x03300000 0 0x30000>,
86+
@@ -2816,6 +2874,16 @@ lpass_tx_swr_data: tx-swr-data-state {
87+
pins = "gpio1", "gpio2", "gpio14";
88+
function = "swr_tx_data";
89+
};
90+
+
91+
+ lpass_wsa_swr_clk: wsa-swr-clk-state {
92+
+ pins = "gpio10";
93+
+ function = "wsa_swr_clk";
94+
+ };
95+
+
96+
+ lpass_wsa_swr_data: wsa-swr-data-state {
97+
+ pins = "gpio11";
98+
+ function = "wsa_swr_data";
99+
+ };
100+
};
101+
102+
gpu: gpu@3d00000 {
103+
--
104+
2.34.1
105+

‎recipes-kernel/linux/linux-yocto-dev/qcm6490-board-dts/0003-arm64-dts-qcom-qcs6490-rb3gen2-Modify-WSA-and-VA-mac.patch‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
From 0c90f9d90ff75ac50db39ec199b25725d97c0620 Mon Sep 17 00:00:00 2001
2+
From: Mohammad Rafi Shaik <[email protected]>
3+
Date: Mon, 17 Mar 2025 11:11:46 +0530
4+
Subject: [PATCH 3/5] arm64: dts: qcom: qcs6490-rb3gen2: Modify WSA and VA
5+
macro clock nodes for audioreach solution
6+
7+
Modify and enable WSA, VA and lpass_tlmm clock properties.
8+
For audioreach solution mclk, npl and fsgen clocks
9+
are enabled through the q6prm clock driver.
10+
11+
Signed-off-by: Mohammad Rafi Shaik <[email protected]>
12+
Co-developed-by: Prasad Kumpatla <[email protected]>
13+
Signed-off-by: Prasad Kumpatla <[email protected]>
14+
Upstream-Status: Submitted [https://lore.kernel.org/linux-arm-msm/[email protected]/]
15+
---
16+
arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts | 31 ++++++++++++++++++++
17+
1 file changed, 31 insertions(+)
18+
19+
diff --git a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
20+
index e962b3ae3400..5de90307e440 100644
21+
--- a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
22+
+++ b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
23+
@@ -12,6 +12,7 @@
24+
#include <dt-bindings/leds/common.h>
25+
#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
26+
#include <dt-bindings/regulator/qcom,rpmh-regulator.h>
27+
+#include <dt-bindings/sound/qcom,q6afe.h>
28+
#include "sc7280.dtsi"
29+
#include "pm7250b.dtsi"
30+
#include "pm7325.dtsi"
31+
@@ -716,6 +717,36 @@ redriver_usb_con_sbu: endpoint {
32+
};
33+
};
34+
35+
+&lpass_tlmm {
36+
+ clocks = <&q6prmcc LPASS_HW_MACRO_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>,
37+
+ <&q6prmcc LPASS_HW_DCODEC_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>;
38+
+ clock-names = "core", "audio";
39+
+};
40+
+
41+
+&lpass_va_macro {
42+
+ /delete-property/ power-domains;
43+
+ /delete-property/ power-domain-names;
44+
+ clocks = <&q6prmcc LPASS_CLK_ID_VA_CORE_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>,
45+
+ <&q6prmcc LPASS_HW_MACRO_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>,
46+
+ <&q6prmcc LPASS_HW_DCODEC_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>;
47+
+ clock-names = "mclk", "macro", "dcodec";
48+
+
49+
+ status = "okay";
50+
+};
51+
+
52+
+&lpass_wsa_macro {
53+
+ /delete-property/ power-domains;
54+
+ /delete-property/ power-domain-names;
55+
+ clocks = <&q6prmcc LPASS_CLK_ID_TX_CORE_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>,
56+
+ <&q6prmcc LPASS_CLK_ID_TX_CORE_NPL_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>,
57+
+ <&q6prmcc LPASS_HW_MACRO_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>,
58+
+ <&q6prmcc LPASS_HW_DCODEC_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>,
59+
+ <&lpass_va_macro>;
60+
+ clock-names = "mclk", "npl", "macro", "dcodec", "fsgen";
61+
+
62+
+ status = "okay";
63+
+};
64+
+
65+
&mdss {
66+
status = "okay";
67+
};
68+
--
69+
2.34.1
70+

‎recipes-kernel/linux/linux-yocto-dev/qcm6490-board-dts/0004-arm64-dts-qcom-qcs6490-rb3gen2-add-WSA8830-speakers-.patch‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
From 41a4a1b2fb8086905655654b910a10c16ace3c63 Mon Sep 17 00:00:00 2001
2+
From: Jorge Ramirez-Ortiz <[email protected]>
3+
Date: Tue, 25 Mar 2025 17:19:40 +0100
4+
Subject: [PATCH 4/5] arm64: dts: qcom: qcs6490-rb3gen2: add WSA8830 speakers
5+
amplifier
6+
7+
Add nodes for WSA8830 speakers amplifier on qcs6490-rb3gen2 board.
8+
9+
Signed-off-by: Mohammad Rafi Shaik <[email protected]>
10+
Co-developed-by: Prasad Kumpatla <[email protected]>
11+
Signed-off-by: Prasad Kumpatla <[email protected]>
12+
Upstream-Status: Submitted [https://lore.kernel.org/linux-arm-msm/[email protected]/]
13+
---
14+
arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts | 27 ++++++++++++++++++++
15+
1 file changed, 27 insertions(+)
16+
17+
diff --git a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
18+
index 5de90307e440..d35878783d5d 100644
19+
--- a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
20+
+++ b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
21+
@@ -1035,6 +1035,33 @@ tc956x_rst_state: tc956x-rst-state {
22+
};
23+
};
24+
25+
+&swr2 {
26+
+ qcom,din-ports = <0>;
27+
+ qcom,dout-ports = <8>;
28+
+
29+
+ left_spkr: speaker@0,1 {
30+
+ compatible = "sdw10217020200";
31+
+ reg = <0 1>;
32+
+ powerdown-gpios = <&tlmm 158 GPIO_ACTIVE_LOW>;
33+
+ #sound-dai-cells = <0>;
34+
+ sound-name-prefix = "SpkrLeft";
35+
+ #thermal-sensor-cells = <0>;
36+
+ vdd-supply = <&vreg_l18b_1p8>;
37+
+ qcom,port-mapping = <1 2 3 7>;
38+
+ };
39+
+
40+
+ right_spkr: speaker@0,2 {
41+
+ compatible = "sdw10217020200";
42+
+ reg = <0 2>;
43+
+ powerdown-gpios = <&tlmm 158 GPIO_ACTIVE_LOW>;
44+
+ #sound-dai-cells = <0>;
45+
+ sound-name-prefix = "SpkrRight";
46+
+ #thermal-sensor-cells = <0>;
47+
+ vdd-supply = <&vreg_l18b_1p8>;
48+
+ qcom,port-mapping = <4 5 6 8>;
49+
+ };
50+
+};
51+
+
52+
&tlmm {
53+
gpio-reserved-ranges = <32 2>, /* ADSP */
54+
<48 4>; /* NFC */
55+
--
56+
2.34.1
57+

0 commit comments

Comments
 (0)