From 268b2ba14ebbb7476daf4b4e4f04cddebf7b6889 Mon Sep 17 00:00:00 2001 From: Dechen Chai Date: Tue, 29 Mar 2022 07:42:21 +0530 Subject: [PATCH] Revert "ASOC: Disable Temperature sensor of WSA881x for bengal" This reverts commit d1644ff55dc65e241c8ca4fff0bca00e3dc38dcf. Change-Id: Iac9a0d8128bbce516ea147a70f0266d256a0f3c3 Signed-off-by: Dechen Chai --- config/bengalauto.conf | 1 - config/bengalautoconf.h | 37 +------------------------------------ 2 files changed, 1 insertion(+), 37 deletions(-) diff --git a/config/bengalauto.conf b/config/bengalauto.conf index 8f2dc3bd953f..f51e7be98f4f 100644 --- a/config/bengalauto.conf +++ b/config/bengalauto.conf @@ -3,7 +3,6 @@ CONFIG_AUDIO_EXT_CLK=m CONFIG_SND_SOC_WCD9XXX_V2=m CONFIG_SND_SOC_WCD_MBHC=m CONFIG_SND_SOC_WSA881X_ANALOG=m -CONFIG_WSA881X_TEMP_SENSOR_DISABLE=m CONFIG_WCD9XXX_CODEC_CORE_V2=m CONFIG_MSM_CDC_PINCTRL=m CONFIG_MSM_QDSP6V2_CODECS=m diff --git a/config/bengalautoconf.h b/config/bengalautoconf.h index b74279a8689a..42d962160927 100644 --- a/config/bengalautoconf.h +++ b/config/bengalautoconf.h @@ -1,39 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -/* Copyright (c) 2019-2021, The Linux Foundation. All rights reserved. - * - * Changes from Qualcomm Innovation Center are provided under the following license: - * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted (subject to the limitations in the - * disclaimer below) provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials provided - * with the distribution. - * - * * Neither the name of Qualcomm Innovation Center, Inc. nor the - * names of its contributors may be used to endorse or promote - * products derived from this software without specific prior - * written permission. - * - * NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE - * GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT - * HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE - * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER - * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN - * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +/* Copyright (c) 2019-2020, The Linux Foundation. All rights reserved. */ #define CONFIG_PINCTRL_LPI 1 @@ -41,7 +7,6 @@ #define CONFIG_SND_SOC_WCD9XXX_V2 1 #define CONFIG_SND_SOC_WCD_MBHC 1 #define CONFIG_SND_SOC_WSA881X_ANALOG 1 -#define CONFIG_WSA881X_TEMP_SENSOR_DISABLE 1 #define CONFIG_WCD9XXX_CODEC_CORE_V2 1 #define CONFIG_MSM_CDC_PINCTRL 1 #define CONFIG_MSM_QDSP6V2_CODECS 1