Evolution-x-devices/kernel_oneplus_sm8550-devicetrees
2
0
Fork 0
mirror of https://github.com/Evolution-X-Devices/kernel_oneplus_sm8550-devicetrees synced 2026-02-01 09:49:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "audio dts: disable swr-haptics for kalama-hhg."

Browse Source
This commit is contained in:
qctecmdr
2022-09-06 22:59:45 -07:00
committed by Gerrit - the friendly Code Review server
parent 79be8a8e94 888a287734
commit 0b89d77df7
5 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Kbuild
View File

@@ -10,7 +10,7 @@ dtbo-y += kalama-audio.dtbo \
kalama-audio-rcm.dtbo \
kalama-audio-rumi.dtbo \
kalama-audio-hdk.dtbo \
kalama-audio-hhg.dtbo
kalama-sg-audio-hhg.dtbo
endif
ifeq ($(CONFIG_ARCH_SA8155), y)

10
kalama-audio-hhg.dts
View File

@@ -1,10 +0,0 @@
/dts-v1/;
/plugin/;
#include "kalama-audio-hhg.dtsi"
/ {
model = "Qualcomm Technologies, Inc. KalamaP HHG";
compatible = "qcom,kalamap-hhg", "qcom,kalamap", "qcom,hhg";
qcom,msm-id = <536 0x10000>, <536 0x20000>;
qcom,board-id = <0x1001f 0x1>;
};

2
kalama-audio.dts
View File

@@ -11,6 +11,6 @@
/ {
model = "Qualcomm Technologies, Inc. Kalama";
compatible = "qcom,kalama";
qcom,msm-id = <519 0x10000>, <536 0x10000>, <519 0x20000>, <536 0x20000>;
qcom,msm-id = <519 0x10000>, <536 0x10000>, <519 0x20000>, <536 0x20000>, <600 0x20000>, <601 0x20000>;
qcom,board-id = <0 0>;
};

10
kalama-sg-audio-hhg.dts Normal file
View File

@@ -0,0 +1,10 @@
/dts-v1/;
/plugin/;
#include "kalama-sg-audio-hhg.dtsi"
/ {
model = "Qualcomm Technologies, Inc. Kalama SG HHG";
compatible = "qcom,kalamap", "qcom,hhg";
qcom,msm-id = <600 0x20000>, <601 0x20000>;
qcom,board-id = <0x1001f 0x1>;
};

11
kalama-audio-hhg.dtsi → kalama-sg-audio-hhg.dtsi
View File

@@ -23,9 +23,19 @@
};
};
&wsa_macro {
qcom,wsa-bat-cfgs = <2>, <2>;
};
&swr_haptics {
status = "disabled";
};
&kalama_snd {
qcom,model = "kalama-grd-snd-card";
swr-haptics-unsupported;
qcom,audio-routing =
"AMIC1", "Analog Mic1",
"AMIC1", "MIC BIAS1",
@@ -50,7 +60,6 @@
"IN1_HPHL", "HPHL_OUT",
"IN2_HPHR", "HPHR_OUT",
"IN3_AUX", "AUX_OUT",
"HAP_IN", "PCM_OUT",
"WSA SRC0_INP", "SRC0",
"WSA_TX DEC0_INP", "TX DEC0 MUX",
"WSA_TX DEC1_INP", "TX DEC1 MUX",