Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit ebaae91b authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'LA.UM.9.14.r1-19600.01-LAHAINA.QSSI12.0' of... 

Merge tag 'LA.UM.9.14.r1-19600.01-LAHAINA.QSSI12.0' of https://git.codelinaro.org/clo/la/platform/vendor/opensource/audio-kernel into android12-5.4-lahaina

"LA.UM.9.14.r1-19600.01-LAHAINA.QSSI12.0"

* tag 'LA.UM.9.14.r1-19600.01-LAHAINA.QSSI12.0' of https://git.codelinaro.org/clo/la/platform/vendor/opensource/audio-kernel:
  kernel: Check for buffer overflow and NULL pointer
  asoc: Add LLNP mode support
  asoc: Update machine driver for kona
  ASoC: codecs: Force enable micbias standalone
  audio-kernel: add ar conf in makefie
  ipc: apr: Add config to control the ipc context print
  asoc: Disable chmixer override flag
  asoc: get and put for SEC_TDM_RX_0/TX_0 ADM channels
  asoc: msm-pcm-routing: Assign default topology when app_type is zero
  ASoC: wcd937x: Add check for ULP irrespective of the Class
  asoc: wsa881x: Fix panic on stress reboot
  asoc: sm6150: change msm_wcn_be_dai_links name

Change-Id: Ia587e1021992c7e6d43710fbb6e20c60fe7be100
parents f3bf0f1c 5396bb76

techpack/audio/Makefile.am

+20 −3
Original line number Diff line number Diff line
@@ -15,6 +15,9 @@ endif 
ifeq ($(TARGET_SUPPORT), qrbx210)

KBUILD_OPTIONS += CONFIG_ARCH_BENGAL=y

endif

ifeq ($(TARGET_SUPPORT), qrb5165)

KBUILD_OPTIONS += CONFIG_ARCH_KONA=y

endif



subdir-ccflags-y += -I$(AUDIO_ROOT)/include/uapi/
@@ -39,12 +42,18 @@ obj-m += asoc/codecs/bolero/ 
obj-m += asoc/codecs/wcd937x/

KBUILD_CFLAGS += -Wno-error

endif

ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), qrb5165))

obj-m += asoc/codecs/bolero/

obj-m += asoc/codecs/wcd938x/

bj-m += asoc/codecs/wsa883x/

KBUILD_CFLAGS += -Wno-error

endif

ifeq ($(TARGET_SUPPORT), sdmsteppe)

obj-m += asoc/codecs/bolero/

obj-m += asoc/codecs/wcd937x/

endif



ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), sa8155 sa8155ivi sa6155 sa8195 qtiquingvm qtiquingvm8295 sa8295 qtigvmi3))

ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), sa8155 sa8155ivi sa6155 sa8195 qtiquingvm qtiquingvm8295 sa8295))

KBUILD_OPTIONS += CONFIG_SND_SOC_AUTO=y

obj-m := ipc/

obj-m += dsp/
@@ -57,14 +66,22 @@ endif 
ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), sa6155))

KBUILD_OPTIONS += CONFIG_SND_SOC_SA6155=m

endif

ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), qtiquingvm qtigvmi3))

ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), qtiquingvm))

KBUILD_OPTIONS += CONFIG_SND_SOC_GVM=m

endif

ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), qtiquingvm8295))

KBUILD_OPTIONS += CONFIG_SND_SOC_GVM_SA8295=m

endif

endif



ifeq ($(AR_SUPPORT), $(filter $(AR_SUPPORT), yes))

obj-m := ipc/

obj-m += dsp/

obj-m += asoc/

obj-m += asoc/codecs/

obj-m += soc/

KBUILD_OPTIONS += CONFIG_SND_SOC_AUTO=y

KBUILD_OPTIONS += CONFIG_SND_SOC_AR=m

endif

all:

	$(shell rm -fr $(shell pwd)/soc/core.h)

	$(shell ln -s $(KERNEL_SRC)/drivers/pinctrl/core.h $(shell pwd)/soc/core.h)

techpack/audio/asoc/Kbuild

100644 → 100755
+5 −0
Original line number Diff line number Diff line
@@ -29,6 +29,11 @@ ifeq ($(CONFIG_SND_SOC_AUTO), y) 
		export

		INCS    +=  -include $(AUDIO_ROOT)/config/gvmautoconf.h

	endif

	ifdef CONFIG_SND_SOC_AR

		include $(AUDIO_ROOT)/config/arauto.conf

		export

		INCS    +=  -include $(AUDIO_ROOT)/config/arautoconf.h

	endif

	ifdef CONFIG_SND_SOC_GVM_SA8295

		include $(AUDIO_ROOT)/config/sa8295gvmauto.conf

		export

techpack/audio/asoc/codecs/Kbuild

+5 −0
Original line number Diff line number Diff line
@@ -29,6 +29,11 @@ ifeq ($(CONFIG_SND_SOC_AUTO), y) 
		export

		INCS    +=  -include $(AUDIO_ROOT)/config/gvmautoconf.h

	endif

	ifdef CONFIG_SND_SOC_AR

		include $(AUDIO_ROOT)/config/arauto.conf

		export

		INCS    +=  -include $(AUDIO_ROOT)/config/arautoconf.h

	endif

	ifdef CONFIG_SND_SOC_GVM_SA8295

		include $(AUDIO_ROOT)/config/sa8295gvmauto.conf

		export

techpack/audio/asoc/codecs/wcd937x/wcd937x.c

+8 −4
Original line number Diff line number Diff line
@@ -505,7 +505,8 @@ static int wcd937x_codec_hphl_dac_event(struct snd_soc_dapm_widget *w, 
	case SND_SOC_DAPM_POST_PMU:

		if ((snd_soc_component_read32(component,

		   WCD937X_DIGITAL_EFUSE_REG_16) == 0x02) &&

		   hph_mode == CLS_H_ULP)

		   ((snd_soc_component_read32(component,

			WCD937X_ANA_HPH) & 0x0C) == 0x0C))

			snd_soc_component_update_bits(component,

			WCD937X_RX_BIAS_HPH_LOWPOWER, 0xF0, 0x90);

		if (hph_mode == CLS_AB_HIFI || hph_mode == CLS_H_HIFI)
@@ -551,7 +552,8 @@ static int wcd937x_codec_hphl_dac_event(struct snd_soc_dapm_widget *w, 
	case SND_SOC_DAPM_POST_PMD:

		if ((snd_soc_component_read32(component,

		   WCD937X_DIGITAL_EFUSE_REG_16) == 0x02) &&

		   hph_mode == CLS_H_ULP)

		   ((snd_soc_component_read32(component,

			WCD937X_ANA_HPH) & 0x0C) == 0x0C))

			snd_soc_component_update_bits(component,

			WCD937X_RX_BIAS_HPH_LOWPOWER, 0xF0, 0x80);

		snd_soc_component_update_bits(component,
@@ -589,7 +591,8 @@ static int wcd937x_codec_hphr_dac_event(struct snd_soc_dapm_widget *w, 
	case SND_SOC_DAPM_POST_PMU:

		if ((snd_soc_component_read32(component,

		   WCD937X_DIGITAL_EFUSE_REG_16) == 0x02) &&

		   hph_mode == CLS_H_ULP)

		   ((snd_soc_component_read32(component,

			WCD937X_ANA_HPH) & 0x0C) == 0x0C))

			snd_soc_component_update_bits(component,

			WCD937X_RX_BIAS_HPH_LOWPOWER, 0xF0, 0x90);

		if (hph_mode == CLS_AB_HIFI || hph_mode == CLS_H_HIFI)
@@ -635,7 +638,8 @@ static int wcd937x_codec_hphr_dac_event(struct snd_soc_dapm_widget *w, 
	case SND_SOC_DAPM_POST_PMD:

		if ((snd_soc_component_read32(component,

		   WCD937X_DIGITAL_EFUSE_REG_16) == 0x02) &&

		   hph_mode == CLS_H_ULP)

		   ((snd_soc_component_read32(component,

			WCD937X_ANA_HPH) & 0x0C) == 0x0C))

			snd_soc_component_update_bits(component,

			WCD937X_RX_BIAS_HPH_LOWPOWER, 0xF0, 0x80);

		snd_soc_component_update_bits(component,

techpack/audio/asoc/codecs/wcd938x/internal.h

+2 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.

 * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.

 */



#ifndef _WCD938X_INTERNAL_H
@@ -110,6 +111,7 @@ struct wcd938x_priv { 
	/* wcd to swr dmic notification */

	bool notify_swr_dmic;

	struct blocking_notifier_head notifier;

	int micb_enabled[WCD938X_MAX_MICBIAS];

};



struct wcd938x_micbias_setting {