From 542c8b16d5b9470ba2babad9f2cc1ae01b21ef24 Mon Sep 17 00:00:00 2001 From: Vaishali Gupta Date: Sun, 17 Mar 2024 23:04:04 -0700 Subject: [PATCH] Revert "ARM: dt-bindings: Disable haptics for cdp variants" This reverts commit 98cab652ca4821934cb81ff15f34b707b5b089c3. Change-Id: I0c2465e7f4f669b6ab8f3079322e3902c5f094b6 Signed-off-by: Vaishali Gupta --- sun-audio-cdp.dtsi | 4 ---- sun-audio-hamilton-cdp.dtsi | 2 +- sun-audio-rumi.dtsi | 5 +---- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/sun-audio-cdp.dtsi b/sun-audio-cdp.dtsi index e76cd14a..b25f4300 100644 --- a/sun-audio-cdp.dtsi +++ b/sun-audio-cdp.dtsi @@ -40,13 +40,9 @@ &cdc_sep_mi2s_gpios { status = "disabled"; }; -&swr_haptics { - status = "disabled"; -}; &sun_snd { qcom,model = "sun-cdp-snd-card"; - swr-haptics-unsupported; qcom,audio-routing = "AMIC1", "Analog Mic1", "AMIC1", "MIC BIAS1", diff --git a/sun-audio-hamilton-cdp.dtsi b/sun-audio-hamilton-cdp.dtsi index f903de43..bbbe89d8 100644 --- a/sun-audio-hamilton-cdp.dtsi +++ b/sun-audio-hamilton-cdp.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ /*This is CDP with Hamilton wlan*/ diff --git a/sun-audio-rumi.dtsi b/sun-audio-rumi.dtsi index 093dfa8b..b488ac34 100644 --- a/sun-audio-rumi.dtsi +++ b/sun-audio-rumi.dtsi @@ -1,13 +1,10 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include "sun-audio-overlay.dtsi" -&swr_haptics { - status = "disabled"; -}; &sun_snd { compatible = "qcom,sun-asoc-snd-stub"; asoc-codec = <&stub_codec>;