Merge "ARM: dts: msm: add wcn-bt-ext for enabling second bt backend。" into audio-kernel-handset.lnx.10.0.r1-rel
This commit is contained in:
committed by
Gerrit - the friendly Code Review server
commit
4ff79d5691
@@ -1,6 +1,10 @@
|
|||||||
// SPDX-License-Identifier: BSD-3-Clause
|
// SPDX-License-Identifier: BSD-3-Clause
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
|
* Copyright (c) 2023-2025 Qualcomm Innovation Center, Inc. All rights reserved.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "sun-audio-cdp.dtsi"
|
#include "sun-audio-cdp.dtsi"
|
||||||
|
|
||||||
|
&sun_snd {
|
||||||
|
qcom,wcn-bt-ext = <0>;
|
||||||
|
};
|
||||||
|
@@ -136,4 +136,5 @@
|
|||||||
qcom,usbss-hsj-connect-enabled;
|
qcom,usbss-hsj-connect-enabled;
|
||||||
qcom,msm-mbhc-hs-mic-max-threshold-mv = <1680>;
|
qcom,msm-mbhc-hs-mic-max-threshold-mv = <1680>;
|
||||||
wcd939x-i2c-handle = <&wcd_usbss>;
|
wcd939x-i2c-handle = <&wcd_usbss>;
|
||||||
|
qcom,wcn-bt-ext = <1>;
|
||||||
};
|
};
|
||||||
|
@@ -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.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*This is CDP with Hamilton wlan*/
|
/*This is CDP with Hamilton wlan*/
|
||||||
@@ -8,3 +8,7 @@
|
|||||||
&lpass_bt_swr {
|
&lpass_bt_swr {
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
&sun_snd {
|
||||||
|
qcom,wcn-bt-ext = <0>;
|
||||||
|
};
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
// SPDX-License-Identifier: BSD-3-Clause
|
// SPDX-License-Identifier: BSD-3-Clause
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
|
* Copyright (c) 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/dts-v1/;
|
/dts-v1/;
|
||||||
@@ -13,4 +13,5 @@
|
|||||||
qcom,msm-mbhc-usbc-audio-supported = <0>;
|
qcom,msm-mbhc-usbc-audio-supported = <0>;
|
||||||
qcom,msm-mbhc-hphl-swh = <1>;
|
qcom,msm-mbhc-hphl-swh = <1>;
|
||||||
qcom,msm-mbhc-gnd-swh = <1>;
|
qcom,msm-mbhc-gnd-swh = <1>;
|
||||||
|
qcom,wcn-bt-ext = <0>;
|
||||||
};
|
};
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
// SPDX-License-Identifier: BSD-3-Clause
|
// SPDX-License-Identifier: BSD-3-Clause
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
|
* Copyright (c) 2023-2025 Qualcomm Innovation Center, Inc. All rights reserved.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "sun-audio-mtp.dtsi"
|
#include "sun-audio-mtp.dtsi"
|
||||||
@@ -13,5 +13,6 @@
|
|||||||
qcom,model = "sun-mtp-wsa883x-snd-card";
|
qcom,model = "sun-mtp-wsa883x-snd-card";
|
||||||
qcom,msm_audio_ssr_devs = <&audio_gpr>, <&lpi_tlmm>,
|
qcom,msm_audio_ssr_devs = <&audio_gpr>, <&lpi_tlmm>,
|
||||||
<&lpass_cdc>;
|
<&lpass_cdc>;
|
||||||
|
qcom,wcn-bt-ext = <0>;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
// SPDX-License-Identifier: BSD-3-Clause
|
// SPDX-License-Identifier: BSD-3-Clause
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
|
* Copyright (c) 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "sun-audio-mtp-qmp.dtsi"
|
#include "sun-audio-mtp-qmp.dtsi"
|
||||||
@@ -13,5 +13,6 @@
|
|||||||
qcom,model = "sun-mtp-wsa883x_qmp-snd-card";
|
qcom,model = "sun-mtp-wsa883x_qmp-snd-card";
|
||||||
qcom,msm_audio_ssr_devs = <&audio_gpr>, <&lpi_tlmm>,
|
qcom,msm_audio_ssr_devs = <&audio_gpr>, <&lpi_tlmm>,
|
||||||
<&lpass_cdc>;
|
<&lpass_cdc>;
|
||||||
|
qcom,wcn-bt-ext = <0>;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
// SPDX-License-Identifier: BSD-3-Clause
|
// SPDX-License-Identifier: BSD-3-Clause
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
|
* Copyright (c) 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "sun-audio-qrd.dtsi"
|
#include "sun-audio-qrd.dtsi"
|
||||||
@@ -11,4 +11,5 @@
|
|||||||
qcom,msm-mbhc-usbc-audio-supported = <0>;
|
qcom,msm-mbhc-usbc-audio-supported = <0>;
|
||||||
qcom,msm-mbhc-hphl-swh = <1>;
|
qcom,msm-mbhc-hphl-swh = <1>;
|
||||||
qcom,msm-mbhc-gnd-swh = <1>;
|
qcom,msm-mbhc-gnd-swh = <1>;
|
||||||
|
qcom,wcn-bt-ext = <0>;
|
||||||
};
|
};
|
||||||
|
@@ -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 "sun-audio-overlay.dtsi"
|
#include "sun-audio-overlay.dtsi"
|
||||||
@@ -91,6 +91,7 @@
|
|||||||
qcom,msm-mbhc-usbc-audio-supported = <1>;
|
qcom,msm-mbhc-usbc-audio-supported = <1>;
|
||||||
qcom,msm-mbhc-hphl-swh = <0>;
|
qcom,msm-mbhc-hphl-swh = <0>;
|
||||||
qcom,msm-mbhc-gnd-swh = <0>;
|
qcom,msm-mbhc-gnd-swh = <0>;
|
||||||
|
qcom,wcn-bt-ext = <1>;
|
||||||
qcom,wcd-disable-legacy-surge;
|
qcom,wcd-disable-legacy-surge;
|
||||||
wcd939x-i2c-handle = <&wcd_usbss>;
|
wcd939x-i2c-handle = <&wcd_usbss>;
|
||||||
};
|
};
|
||||||
|
@@ -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 <bindings/qcom,audio-ext-clk.h>
|
#include <bindings/qcom,audio-ext-clk.h>
|
||||||
@@ -439,7 +439,6 @@
|
|||||||
qcom,msm-mi2s-master = <1>, <1>, <1>, <1>, <1>, <1>, <1>;
|
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,mi2s-tdm-is-hw-vote-needed = <1>, <1>, <1>, <1>, <1>, <1>, <1>;
|
||||||
qcom,wcn-bt = <1>;
|
qcom,wcn-bt = <1>;
|
||||||
qcom,wcn-bt-ext = <1>;
|
|
||||||
qcom,ext-disp-audio-rx = <1>;
|
qcom,ext-disp-audio-rx = <1>;
|
||||||
qcom,tdm-max-slots = <8>;
|
qcom,tdm-max-slots = <8>;
|
||||||
qcom,tdm-clk-attribute = <0x1>, <0x1>, <0x1>, <0x1>, <0x1>, <0x1>, <0x1>;
|
qcom,tdm-clk-attribute = <0x1>, <0x1>, <0x1>, <0x1>, <0x1>, <0x1>, <0x1>;
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
// SPDX-License-Identifier: BSD-3-Clause
|
// SPDX-License-Identifier: BSD-3-Clause
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
|
* Copyright (c) 2023-2025 Qualcomm Innovation Center, Inc. All rights reserved.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "sun-audio-qrd.dtsi"
|
#include "sun-audio-qrd.dtsi"
|
||||||
@@ -14,4 +14,5 @@
|
|||||||
|
|
||||||
&sun_snd {
|
&sun_snd {
|
||||||
qcom,model = "sun-qrd-sku2-snd-card";
|
qcom,model = "sun-qrd-sku2-snd-card";
|
||||||
|
qcom,wcn-bt-ext = <1>;
|
||||||
};
|
};
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
// SPDX-License-Identifier: BSD-3-Clause
|
// SPDX-License-Identifier: BSD-3-Clause
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
|
* Copyright (c) 2023-2025 Qualcomm Innovation Center, Inc. All rights reserved.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "sun-audio-overlay.dtsi"
|
#include "sun-audio-overlay.dtsi"
|
||||||
@@ -104,6 +104,7 @@
|
|||||||
qcom,msm-mbhc-hphl-swh = <0>;
|
qcom,msm-mbhc-hphl-swh = <0>;
|
||||||
qcom,msm-mbhc-gnd-swh = <0>;
|
qcom,msm-mbhc-gnd-swh = <0>;
|
||||||
qcom,msm-mbhc-hs-mic-max-threshold-mv = <1670>;
|
qcom,msm-mbhc-hs-mic-max-threshold-mv = <1670>;
|
||||||
|
qcom,wcn-bt-ext = <1>;
|
||||||
qcom,wcd-disable-legacy-surge;
|
qcom,wcd-disable-legacy-surge;
|
||||||
wcd939x-i2c-handle = <&wcd_usbss>;
|
wcd939x-i2c-handle = <&wcd_usbss>;
|
||||||
};
|
};
|
||||||
|
@@ -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 "sun-audio-overlay.dtsi"
|
#include "sun-audio-overlay.dtsi"
|
||||||
@@ -14,4 +14,5 @@
|
|||||||
compatible = "qcom,sun-asoc-snd-stub";
|
compatible = "qcom,sun-asoc-snd-stub";
|
||||||
asoc-codec = <&stub_codec>;
|
asoc-codec = <&stub_codec>;
|
||||||
asoc-codec-names = "msm-stub-codec.1";
|
asoc-codec-names = "msm-stub-codec.1";
|
||||||
|
qcom,wcn-bt-ext = <1>;
|
||||||
};
|
};
|
||||||
|
Reference in New Issue
Block a user