Merge "ARM: dts: msm: enable swr haptics dailinks in Kera"

This commit is contained in:
QCTECMDR Service
2025-01-30 09:08:09 -08:00
committed by Gerrit - the friendly Code Review server
2 changed files with 1 additions and 3 deletions

View File

@@ -157,7 +157,6 @@
"wcd939x_codec", "wsa-codec1", "wcd939x_codec", "wsa-codec1",
"wsa-codec2"; "wsa-codec2";
qcom,wsa-max-devs = <2>; qcom,wsa-max-devs = <2>;
swr-haptics-unsupported;
qcom,pri-mi2s-gpios = <&cdc_pri_mi2s_gpios>; qcom,pri-mi2s-gpios = <&cdc_pri_mi2s_gpios>;
qcom,wcd-disable-legacy-surge; qcom,wcd-disable-legacy-surge;
wcd939x-i2c-handle = <&wcd_usbss>; wcd939x-i2c-handle = <&wcd_usbss>;

View File

@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-3-Clause // SPDX-License-Identifier: BSD-3-Clause
/* /*
* Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. * Copyright (c) 2023-2025 Qualcomm Innovation Center, Inc. All rights reserved.
*/ */
#include "kera-audio-overlay.dtsi" #include "kera-audio-overlay.dtsi"
#include "kera-audio-lpass-reg.dtsi" #include "kera-audio-lpass-reg.dtsi"
@@ -77,7 +77,6 @@
&kera_snd { &kera_snd {
qcom,model = "kera-qrd-snd-card"; qcom,model = "kera-qrd-snd-card";
swr-haptics-unsupported;
asoc-codec = <&stub_codec>, <&lpass_cdc>, asoc-codec = <&stub_codec>, <&lpass_cdc>,
<&wcd9378_codec>, <&wsa884x_0220>; <&wcd9378_codec>, <&wsa884x_0220>;
asoc-codec-names = "msm-stub-codec.1", "lpass-cdc", asoc-codec-names = "msm-stub-codec.1", "lpass-cdc",