Merge "ARM: dts: qcom: Disable haptics for cdp variants"
This commit is contained in:
committed by
Gerrit - the friendly Code Review server
commit
d4a8caa00d
@@ -40,9 +40,13 @@
|
|||||||
&cdc_sep_mi2s_gpios {
|
&cdc_sep_mi2s_gpios {
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
&swr_haptics {
|
||||||
|
status = "disabled";
|
||||||
|
};
|
||||||
|
|
||||||
&sun_snd {
|
&sun_snd {
|
||||||
qcom,model = "sun-cdp-snd-card";
|
qcom,model = "sun-cdp-snd-card";
|
||||||
|
swr-haptics-unsupported;
|
||||||
qcom,audio-routing =
|
qcom,audio-routing =
|
||||||
"AMIC1", "Analog Mic1",
|
"AMIC1", "Analog Mic1",
|
||||||
"AMIC1", "MIC BIAS1",
|
"AMIC1", "MIC BIAS1",
|
||||||
|
@@ -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-2024 Qualcomm Innovation Center, Inc. All rights reserved.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*This is CDP with Hamilton wlan*/
|
/*This is CDP with Hamilton wlan*/
|
||||||
|
@@ -1,10 +1,15 @@
|
|||||||
// 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-2024 Qualcomm Innovation Center, Inc. All rights reserved.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "sun-audio-overlay.dtsi"
|
#include "sun-audio-overlay.dtsi"
|
||||||
|
|
||||||
|
&swr_haptics {
|
||||||
|
status = "disabled";
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
&sun_snd {
|
&sun_snd {
|
||||||
compatible = "qcom,sun-asoc-snd-stub";
|
compatible = "qcom,sun-asoc-snd-stub";
|
||||||
asoc-codec = <&stub_codec>;
|
asoc-codec = <&stub_codec>;
|
||||||
|
Reference in New Issue
Block a user