samsung_sm8750/android_kernel_samsung_sm8750-devicetrees
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge b80e9cb9e9 on remote branch

Browse Source 
Change-Id: I178b9f1bdd687dd044f1fbe63b7feebfe7e803ed
This commit is contained in:
Linux Build Service Account
2024-04-16 15:38:33 -07:00
parent 6f30023b5c b80e9cb9e9
commit f450dd4c0d
21 changed files with 86 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Kbuild
View File

@@ -21,7 +21,9 @@ dtbo-y += sun-audio.dtbo \
sun-audio-mtp.dtbo \
sun-audio-mtp-3.5mm.dtbo \
sun-audio-mtp-nfc.dtbo \
sun-audio-mtp-qmp.dtbo \
sun-audio-qrd.dtbo \
sun-audio-hdk.dtbo \
sun-audio-qrd-sku2.dtbo \
sun-audio-atp.dtbo \
sun-audio-rcm.dtbo \

2
pineapple-audio-overlay.dtsi
View File

@@ -409,7 +409,7 @@
qcom,model = "pineapple-mtp-snd-card";
qcom,msm-mi2s-master = <1>, <1>, <1>, <1>, <1>, <1>, <1>;
qcom,mi2s-tdm-is-hw-vote-needed = <1>, <1>, <1>, <1>, <1>, <1>, <1>;
qcom,wcn-bt = <0>;
qcom,wcn-bt = <1>;
qcom,ext-disp-audio-rx = <0>;
qcom,tdm-max-slots = <8>;
qcom,tdm-clk-attribute = <0x1>, <0x1>, <0x1>, <0x1>, <0x1>, <0x1>, <0x1>;

4
sun-audio-atp.dts
View File

@@ -11,6 +11,8 @@
model = "Qualcomm Technologies, Inc. Sun ATP";
compatible = "qcom,sun-atp", "qcom,sun", "qcom,sunp-atp", "qcom,sunp",
"qcom,atp";
qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>,
<0x100026a 0x10000>, <0x100026a 0x20000>,
<0x100027f 0x10000>, <0x100027f 0x20000>;
qcom,board-id = <0x10021 0>;
};

4
sun-audio-cdp-nfc.dts
View File

@@ -11,6 +11,8 @@
/ {
model = "Qualcomm Technologies, Inc. Sun CDP ST54L NFC";
compatible = "qcom,sun-cdp", "qcom,sun", "qcom,sunp-cdp", "qcom,sunp", "qcom,cdp";
qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>,
<0x100026a 0x10000>, <0x100026a 0x20000>,
<0x100027f 0x10000>, <0x100027f 0x20000>;
qcom,board-id = <0x50001 0>;
};

4
sun-audio-cdp.dts
View File

@@ -10,6 +10,8 @@
/ {
model = "Qualcomm Technologies, Inc. Sun CDP";
compatible = "qcom,sun-cdp", "qcom,sun", "qcom,cdp";
qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>,
<0x100026a 0x10000>, <0x100026a 0x20000>,
<0x100027f 0x10000>, <0x100027f 0x20000>;
qcom,board-id = <1 0>, <0x50001 0>;
};

4
sun-audio-hamilton-cdp.dts
View File

@@ -13,7 +13,9 @@
/ {
model = "Qualcomm Technologies, Inc. Sun CDP";
compatible = "qcom,sun-cdp", "qcom,sun", "qcom,sunp-cdp", "qcom,sunp", "qcom,cdp";
qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>,
<0x100026a 0x10000>, <0x100026a 0x20000>,
<0x100027f 0x10000>, <0x100027f 0x20000>;
qcom,board-id = <0x20001 0>, <0x60001 0>;
};

4
sun-audio-hamilton-mtp.dts
View File

@@ -13,7 +13,9 @@
/ {
model = "Qualcomm Technologies, Inc. Sun MTP ST54L NFC";
compatible = "qcom,sun-mtp", "qcom,sun", "qcom,sunp-mtp", "qcom,sunp", "qcom,mtp";
qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>,
<0x100026a 0x10000>, <0x100026a 0x20000>,
<0x100027f 0x10000>, <0x100027f 0x20000>;
qcom,board-id = <0x20008 0>, <0x50008 0>;
};

4
sun-audio-hamilton-rcm.dts
View File

@@ -10,6 +10,8 @@
/ {
model = "Qualcomm Technologies, Inc. Sun RCM";
compatible = "qcom,sun-rcm", "qcom,sun", "qcom,sunp-rcm", "qcom,sunp", "qcom,rcm";
qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>,
<0x100026a 0x10000>, <0x100026a 0x20000>,
<0x100027f 0x10000>, <0x100027f 0x20000>;
qcom,board-id = <0x20015 0>, <0x40015 0>;
};

18
sun-audio-hdk.dts Normal file
View File

@@ -0,0 +1,18 @@
// SPDX-License-Identifier: BSD-3-Clause
/*
* Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
*/
/dts-v1/;
/plugin/;
#include "sun-audio-qrd.dtsi"
/ {
model = "Qualcomm Technologies, Inc. SunP QRD HDK";
compatible = "qcom,sunp-hdk", "qcom,sunp", "qcom,hdk";
qcom,msm-id = <639 0x10000>, <639 0x20000>,
<0x100026a 0x10000>, <0x100026a 0x20000>,
<0x100027f 0x10000>, <0x100027f 0x20000>,
<618 0x10000>, <618 0x20000>;
qcom,board-id = <0x1001f 0>;
};

4
sun-audio-mtp-3.5mm.dts
View File

@@ -19,6 +19,8 @@
/ {
model = "Qualcomm Technologies, Inc. Sun MTP with 3.5mm";
compatible = "qcom,sun-mtp", "qcom,sun", "qcom,sunp-mtp", "qcom,sunp", "qcom,mtp";
qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>,
<0x100026a 0x10000>, <0x100026a 0x20000>,
<0x100027f 0x10000>, <0x100027f 0x20000>;
qcom,board-id = <0x60008 0>;
};

4
sun-audio-mtp-nfc.dts
View File

@@ -13,6 +13,8 @@
/ {
model = "Qualcomm Technologies, Inc. Sun MTP ST54L NFC";
compatible = "qcom,sun-mtp", "qcom,sun", "qcom,sunp-mtp", "qcom,sunp", "qcom,mtp";
qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>,
<0x100026a 0x10000>, <0x100026a 0x20000>,
<0x100027f 0x10000>, <0x100027f 0x20000>;
qcom,board-id = <0x30008 0>, <0x40008 0>;
};

6
sun-audio-mtp-qmp.dts
View File

@@ -11,6 +11,8 @@
/ {
model = "Qualcomm Technologies, Inc. Sun MTP QMP1000";
compatible = "qcom,sun-mtp", "qcom,sun", "qcom,mtp", "qcom,sunp-mtp", "qcom,sunp";
qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
qcom,board-id = <0x10108 0>, <0x40108 0>;
qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>,
<0x100026a 0x10000>, <0x100026a 0x20000>,
<0x100027f 0x10000>, <0x100027f 0x20000>;
qcom,board-id = <0x108 0>, <0x40108 0>;
};

10
sun-audio-mtp-qmp.dtsi
View File

@@ -64,7 +64,7 @@
};
&sun_snd {
qcom,model = "sun-mtp-wsa883x-qmp-snd-card";
qcom,model = "sun-mtp-wsa883x_qmp-snd-card";
asoc-codec = <&stub_codec>, <&lpass_cdc>,
<&wcd939x_codec>, <&swr_haptics>,
<&wsa883x_0221>, <&wsa883x_0222>,
@@ -128,10 +128,10 @@
"VA SWR_INPUT", "QMP_MIC02 LP_OUTPUT",
"VA SWR_INPUT", "QMP_MIC03 LP_OUTPUT",
"VA SWR_INPUT", "QMP_MIC04 LP_OUTPUT",
"VA SWR_INPUT", "QMP_MIC01 NORMAL_OUTPUT",
"VA SWR_INPUT", "QMP_MIC02 NORMAL_OUTPUT",
"VA SWR_INPUT", "QMP_MIC03 NORMAL_OUTPUT",
"VA SWR_INPUT", "QMP_MIC04 NORMAL_OUTPUT",
"VA SWR_INPUT", "QMP_MIC01 VA_NORMAL_OUTPUT",
"VA SWR_INPUT", "QMP_MIC02 VA_NORMAL_OUTPUT",
"VA SWR_INPUT", "QMP_MIC03 VA_NORMAL_OUTPUT",
"VA SWR_INPUT", "QMP_MIC04 VA_NORMAL_OUTPUT",
"VA_AIF1 CAP", "VA_SWR_CLK",
"VA_AIF2 CAP", "VA_SWR_CLK",
"VA_AIF3 CAP", "VA_SWR_CLK",

4
sun-audio-mtp.dts
View File

@@ -10,6 +10,8 @@
/ {
model = "Qualcomm Technologies, Inc. Sun MTP";
compatible = "qcom,sun-mtp", "qcom,sun", "qcom,mtp";
qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>,
<0x100026a 0x10000>, <0x100026a 0x20000>,
<0x100027f 0x10000>, <0x100027f 0x20000>;
qcom,board-id = <8 0>;
};

6
sun-audio-mtp.dtsi
View File

@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-3-Clause
/*
* Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved.
*/
#include "sun-audio-overlay.dtsi"
@@ -120,6 +120,7 @@
cdc-vdd-1p8-supply = <&L15B>;
qcom,cdc-vdd-1p8-voltage = <1800000 1800000>;
qcom,cdc-vdd-1p8-current = <20000>;
qcom,cdc-vdd-1p8-lpm-supported = <1>;
qcom,cdc-static-supplies = "cdc-vdd-1p8";
sound-name-prefix = "SpkrLeft";
};
@@ -132,6 +133,7 @@
cdc-vdd-1p8-supply = <&L15B>;
qcom,cdc-vdd-1p8-voltage = <1800000 1800000>;
qcom,cdc-vdd-1p8-current = <20000>;
qcom,cdc-vdd-1p8-lpm-supported = <1>;
qcom,cdc-static-supplies = "cdc-vdd-1p8";
sound-name-prefix = "SpkrRight";
};
@@ -146,6 +148,7 @@
cdc-vdd-1p8-supply = <&L15B>;
qcom,cdc-vdd-1p8-voltage = <1800000 1800000>;
qcom,cdc-vdd-1p8-current = <20000>;
qcom,cdc-vdd-1p8-lpm-supported = <1>;
qcom,cdc-static-supplies = "cdc-vdd-1p8";
sound-name-prefix = "Spkr2Left";
status = "disabled";
@@ -159,6 +162,7 @@
cdc-vdd-1p8-supply = <&L15B>;
qcom,cdc-vdd-1p8-voltage = <1800000 1800000>;
qcom,cdc-vdd-1p8-current = <20000>;
qcom,cdc-vdd-1p8-lpm-supported = <1>;
qcom,cdc-static-supplies = "cdc-vdd-1p8";
sound-name-prefix = "Spkr2Right";
status = "disabled";

12
sun-audio-overlay.dtsi
View File

@@ -238,7 +238,7 @@
<2 SPKR_L_COMP 0xF>, <3 SPKR_L_BOOST 0x3>,
<4 SPKR_R 0x1>, <5 SPKR_R_COMP 0xF>,
<6 SPKR_R_BOOST 0x3>, <7 PBR 0x3>,
<8 SPKR_HAPT 0x1>, <9 OCPM 0x3>,
<8 SPKR_HAPT 0x1>, <9 OCPM 0x1>,
<10 SPKR_L_VI 0x3>, <11 SPKR_R_VI 0x3>,
<12 SPKR_IPCM 0x3>, <13 CPS 0x3>;
qcom,swr-num-dev = <3>;
@@ -287,7 +287,7 @@
compatible = "qcom,pmih010x-swr-haptics";
reg = <0x03 0xf0170220>;
swr-slave-supply = <&hap_swr_slave_reg>;
qcom,rx_swr_ch_map = <0 0x01 0x01 0 SPKR_HAPT>;
qcom,rx_swr_ch_map = <0 0x01 0x01 0 OCPM>;
};
};
};
@@ -417,6 +417,12 @@
qcom,tdm-clk-attribute = <0x1>, <0x1>, <0x1>, <0x1>, <0x1>, <0x1>, <0x1>;
qcom,mi2s-clk-attribute = <0x1>, <0x1>, <0x1>, <0x1>, <0x1>, <0x1>, <0x1>;
qcom,audio-core-list = <0>, <1>;
/*
* Add this property,
* To Enable swr haptics through OPCM port.
* This will include wsa2 dailinks.
*/
qcom,dedicated-wsa2;
qcom,audio-routing =
"AMIC1", "Analog Mic1",
"AMIC1", "MIC BIAS1",
@@ -449,7 +455,7 @@
"IN1_HPHL", "HPHL_OUT",
"IN2_HPHR", "HPHR_OUT",
"IN3_EAR", "AUX_OUT",
"HAP_IN", "WSA_HAPT OUT",
"HAP_IN", "WSA2_HAPT OUT",
"WSA SRC0_INP", "SRC0",
"WSA_TX DEC0_INP", "TX DEC0 MUX",
"WSA_TX DEC1_INP", "TX DEC1 MUX",

4
sun-audio-qrd-sku2.dts
View File

@@ -10,6 +10,8 @@
/ {
model = "Qualcomm Technologies, Inc. Sun QRD";
compatible = "qcom,sun-qrd", "qcom,sun", "qcom,qrd";
qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>,
<0x100026a 0x10000>, <0x100026a 0x20000>,
<0x100027f 0x10000>, <0x100027f 0x20000>;
qcom,board-id = <0x2000B 0>;
};

4
sun-audio-qrd.dts
View File

@@ -10,6 +10,8 @@
/ {
model = "Qualcomm Technologies, Inc. Sun QRD";
compatible = "qcom,sun-qrd", "qcom,sun", "qcom,qrd";
qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>,
<0x100026a 0x10000>, <0x100026a 0x20000>,
<0x100027f 0x10000>, <0x100027f 0x20000>;
qcom,board-id = <0x1000B 0>, <0x3000B 0>;
};

4
sun-audio-rcm.dts
View File

@@ -10,6 +10,8 @@
/ {
model = "Qualcomm Technologies, Inc. Sun RCM";
compatible = "qcom,sun-rcm", "qcom,sun", "qcom,sunp-rcm", "qcom,sunp", "qcom,rcm";
qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>,
<0x100026a 0x10000>, <0x100026a 0x20000>,
<0x100027f 0x10000>, <0x100027f 0x20000>;
qcom,board-id = <0x15 0>, <0x30015 0>;
};

4
sun-audio-rumi.dts
View File

@@ -10,6 +10,8 @@
/ {
model = "Qualcomm Technologies, Inc. Sun RUMI";
compatible = "qcom,sun-rumi", "qcom,sun", "qcom,rumi";
qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>,
<0x100026a 0x10000>, <0x100026a 0x20000>,
<0x100027f 0x10000>, <0x100027f 0x20000>;
qcom,board-id = <15 0>;
};

4
sun-audio.dts
View File

@@ -16,6 +16,8 @@
/ {
model = "Qualcomm Technologies, Inc. Sun";
compatible = "qcom,sun";
qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>,
<0x100026a 0x10000>, <0x100026a 0x20000>,
<0x100027f 0x10000>, <0x100027f 0x20000>;
qcom,board-id = <0 0>;
};