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

Commit 96b18afd authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 3fc201fd on remote branch 

Change-Id: I0fcf8e623d7cf4abf10a0956d317e3d384391563
parents 4487054f 3fc201fd

Makefile.am

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ obj-m += asoc/ 
obj-m += asoc/codecs/

ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), sdmsteppe))

obj-m += asoc/codecs/wcd934x/

KBUILD_CFLAGS += -Wno-error

endif

ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), qcs40x))

obj-m += asoc/codecs/bolero/

asoc/Kbuild

+12 −4
Original line number Diff line number Diff line
@@ -210,12 +210,20 @@ ifdef CONFIG_SND_SOC_QDSP6V2 
	PLATFORM_OBJS += msm-pcm-loopback-v2.o

	PLATFORM_OBJS += msm-pcm-q6-noirq.o

	PLATFORM_OBJS += msm-pcm-q6-v2.o

	ifeq (y,$(findstring y,$(CONFIG_QTI_QUIN_GVM) $(CONFIG_PLATFORM_AUTO)))

		PLATFORM_OBJS += msm-pcm-routing-auto.o

	else

		PLATFORM_OBJS += msm-pcm-routing-v2.o

		PLATFORM_OBJS += msm-pcm-voice-v2.o

		PLATFORM_OBJS += msm-pcm-voip-v2.o

	endif

	PLATFORM_OBJS += msm-transcode-loopback-q6-v2.o

	ifeq (y,$(findstring y,$(CONFIG_QTI_QUIN_GVM) $(CONFIG_PLATFORM_AUTO)))

		PLATFORM_OBJS += platform_init_auto.o

	else

		PLATFORM_OBJS += platform_init.o

	endif

endif

ifdef CONFIG_WCD9XXX_CODEC_CORE

	PLATFORM_OBJS += msm-dai-slim.o

endif

asoc/bengal.c

100644 → 100755
+11 −0
Original line number Diff line number Diff line
@@ -4983,6 +4983,17 @@ static struct snd_soc_dai_link msm_common_misc_fe_dai_links[] = { 
		.ops = &msm_cdc_dma_be_ops,

		SND_SOC_DAILINK_REG(tx_cdcdma5_tx),

	},

	{/* hw:x,39 */

		.name = "TX4_CDC_DMA Hostless",

		.stream_name = "TX4_CDC_DMA Hostless",

		.dynamic = 1,

		.dpcm_capture = 1,

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			    SND_SOC_DPCM_TRIGGER_POST},

		.no_host_mode = SND_SOC_DAI_LINK_NO_HOST,

		.ignore_suspend = 1,

		SND_SOC_DAILINK_REG(tx4_cdcdma_hostless),

	},

};



static struct snd_soc_dai_link msm_common_be_dai_links[] = {

asoc/codecs/wcd9335-regmap.c

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

/*

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

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

 */



#include <linux/regmap.h>

#include <linux/device.h>

#include <asoc/core.h>

#include <asoc/wcd9xxx-regmap.h>

#include <wcd9335_registers.h>

#include "wcd9335_registers.h"



static const struct reg_sequence wcd9335_1_x_defaults[] = {

	{ WCD9335_CODEC_RPM_CLK_GATE,                     0x03,  0x00 },

asoc/codecs/wcd937x/wcd937x.c

+25 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ static int wcd937x_init_reg(struct snd_soc_component *component) 
		snd_soc_component_update_bits(component,

				WCD937X_BIAS_VBG_FINE_ADJ, 0xF0, 0xB0);

		snd_soc_component_update_bits(component,

				WCD937X_RX_BIAS_HPH_LOWPOWER, 0xF0, 0x90);

				WCD937X_HPH_NEW_INT_RDAC_GAIN_CTL , 0xF0, 0x50);

	}

	return 0;

}
@@ -503,6 +503,12 @@ static int wcd937x_codec_hphl_dac_event(struct snd_soc_dapm_widget *w, 
		set_bit(HPH_COMP_DELAY, &wcd937x->status_mask);

		break;

	case SND_SOC_DAPM_POST_PMU:

		if ((snd_soc_component_read32(component,

		   WCD937X_DIGITAL_EFUSE_REG_16) == 0x02) &&

		   ((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)

			snd_soc_component_update_bits(component,

				WCD937X_HPH_NEW_INT_RDAC_HD2_CTL_L,
@@ -544,6 +550,12 @@ static int wcd937x_codec_hphl_dac_event(struct snd_soc_dapm_widget *w, 
				WCD937X_HPH_NEW_INT_HPH_TIMER1, 0x02, 0x00);

		break;

	case SND_SOC_DAPM_POST_PMD:

		if ((snd_soc_component_read32(component,

		   WCD937X_DIGITAL_EFUSE_REG_16) == 0x02) &&

		   ((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,

			WCD937X_HPH_NEW_INT_RDAC_HD2_CTL_L,

			0x0F, 0x01);
@@ -577,6 +589,12 @@ static int wcd937x_codec_hphr_dac_event(struct snd_soc_dapm_widget *w, 
		set_bit(HPH_COMP_DELAY, &wcd937x->status_mask);

		break;

	case SND_SOC_DAPM_POST_PMU:

		if ((snd_soc_component_read32(component,

		   WCD937X_DIGITAL_EFUSE_REG_16) == 0x02) &&

		   ((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)

			snd_soc_component_update_bits(component,

				WCD937X_HPH_NEW_INT_RDAC_HD2_CTL_R,
@@ -618,6 +636,12 @@ static int wcd937x_codec_hphr_dac_event(struct snd_soc_dapm_widget *w, 
				WCD937X_HPH_NEW_INT_HPH_TIMER1, 0x02, 0x00);

		break;

	case SND_SOC_DAPM_POST_PMD:

		if ((snd_soc_component_read32(component,

		   WCD937X_DIGITAL_EFUSE_REG_16) == 0x02) &&

		   ((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,

			WCD937X_HPH_NEW_INT_RDAC_HD2_CTL_R,

			0x0F, 0x01);