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

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

Merge 02744ac3 on remote branch 

Change-Id: I34ac6ad553fad9588ed7d38d20f8489bd3136204
parents 2f35e02c 02744ac3

Makefile.am

+6 −6
Original line number Diff line number Diff line
@@ -106,12 +106,12 @@ all: 
	$(shell cd $(KERNEL_BINARY_DIR) && $(KERNEL_SRC)/scripts/headers_install.sh $(AUDIO_ROOT)/include/uapi/audio/sound/msmcal-hwdep.h $(UAPI_OUT)/sound/msmcal-hwdep.h)

	$(shell cd $(KERNEL_BINARY_DIR) && $(KERNEL_SRC)/scripts/headers_install.sh $(AUDIO_ROOT)/include/uapi/audio/sound/voice_params.h $(UAPI_OUT)/sound/voice_params.h)

	$(shell cd $(KERNEL_BINARY_DIR) && $(KERNEL_SRC)/scripts/headers_install.sh $(AUDIO_ROOT)/include/uapi/audio/sound/wcd-dsp-glink.h $(UAPI_OUT)/sound/wcd-dsp-glink.h)

	$(shell mkdir -p $(KERNEL_BINARY_DIR)/usr/include/sound)

	$(shell mkdir -p $(KERNEL_BINARY_DIR)/usr/include/linux/mfd)

	$(shell mkdir -p $(KERNEL_BINARY_DIR)/usr/include/linux/mfd/wcd9xxx)

	$(shell cp $(UAPI_OUT)/linux/*.h $(KERNEL_BINARY_DIR)/usr/include/linux/)

	$(shell cp $(UAPI_OUT)/linux/mfd/wcd9xxx/*.h $(KERNEL_BINARY_DIR)/usr/include/linux/mfd/wcd9xxx/)

	$(shell cp $(UAPI_OUT)/sound/*.h $(KERNEL_BINARY_DIR)/usr/include/sound/)

	$(shell mkdir -p $(KERNEL_BINARY_DIR)/usr/include/audio/sound)

	$(shell mkdir -p $(KERNEL_BINARY_DIR)/usr/include/audio/linux/mfd)

	$(shell mkdir -p $(KERNEL_BINARY_DIR)/usr/include/audio/linux/mfd/wcd9xxx)

	$(shell cp $(UAPI_OUT)/linux/*.h $(KERNEL_BINARY_DIR)/usr/include/audio/linux/)

	$(shell cp $(UAPI_OUT)/linux/mfd/wcd9xxx/*.h $(KERNEL_BINARY_DIR)/usr/include/audio/linux/mfd/wcd9xxx/)

	$(shell cp $(UAPI_OUT)/sound/*.h $(KERNEL_BINARY_DIR)/usr/include/audio/sound/)

	$(MAKE) -C $(KERNEL_SRC) M=$(shell pwd) modules $(KBUILD_OPTIONS)



modules_install:

asoc/Kbuild

100755 → 100644
+9 −1
Original line number Diff line number Diff line
@@ -182,9 +182,14 @@ ifdef CONFIG_SND_SOC_SA8155 
	MACHINE_OBJS += sa8155.o

endif



# for gvmgh sound card driver

ifdef CONFIG_SND_SOC_GVM_AUTO_SPF

    SPF_MACHINE_OBJS += gvm_auto_spf_dummy.o

endif



# for sa8295 sound card driver

ifdef CONFIG_SND_SOC_SA8295

	MACHINE_OBJS += sa8295.o

	MACHINE_OBJS += sa8155.o

endif



ifdef CONFIG_SND_SOC_CPE
@@ -312,5 +317,8 @@ machine_dlkm-y := $(MACHINE_OBJS) 
obj-$(CONFIG_SND_SOC_CPE) += cpe_lsm_dlkm.o

cpe_lsm_dlkm-y := $(CPE_LSM_OBJS)



obj-$(CONFIG_SND_SOC_GVM_AUTO_SPF) += spf_machine_dlkm.o

spf_machine_dlkm-y := $(SPF_MACHINE_OBJS)



# inject some build related information

DEFINES += -DBUILD_TIMESTAMP=\"$(shell date -u +'%Y-%m-%dT%H:%M:%SZ')\"

asoc/bengal-port-config.h

+42 −21
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) 2018-2021, The Linux Foundation. All rights reserved.

 */



#ifndef _BENGAL_PORT_CONFIG
@@ -10,43 +10,58 @@ 


/*

 * Add port configuration in the format

 *{ si, off1, off2, hstart, hstop, wd_len, bp_mode, bgp_ctrl, lane_ctrl}

 *{ si, off1, off2, hstart, hstop, wd_len, bp_mode, bgp_ctrl, lane_ctrl, dir,

 *  stream_type}

 */



static struct port_params rx_frame_params_default[SWR_MSTR_PORT_LEN] = {

	{3,  0,  0,  0xFF, 0xFF, 1,    0xFF, 0xFF, 1},

	{31, 0,  0,  3,    6,    7,    0,    0xFF, 0},

	{31, 11, 11, 0xFF, 0xFF, 4,    1,    0xFF, 0},

	{7,  1,  0,  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0},

	{0,  0,  0,  0xFF, 0xFF, 0xFF, 0xFF, 0,    0},

	{3,  0,  0,  0xFF, 0xFF, 1,    0xFF, 0xFF, 1, 0x00, 0x00},

	{31, 0,  0,  3,    6,    7,    0,    0xFF, 0, 0x00, 0x00},

	{31, 11, 11, 0xFF, 0xFF, 4,    1,    0xFF, 0, 0x00, 0x00},

	{7,  1,  0,  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0x00, 0x00},

	{0,  0,  0,  0xFF, 0xFF, 0xFF, 0xFF, 0,    0, 0x00, 0x00},

};



static struct port_params rx_frame_params_rouleur[SWR_MSTR_PORT_LEN] = {

	{3,  0,  0,  0xFF, 0xFF, 1,    0xFF, 0xFF, 1},

	{31, 0,  0,  3,    6,    7,    0,    0xFF, 0},

	{31, 1,  0,  0xFF, 0xFF, 4,    1,    0xFF, 0},

	{7,  1,  0,  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0},

	{0,  0,  0,  0xFF, 0xFF, 0xFF, 0xFF, 0,    0},

	{3,  0,  0,  0xFF, 0xFF, 1,    0xFF, 0xFF, 1, 0x00, 0x00},

	{31, 0,  0,  3,    6,    7,    0,    0xFF, 0, 0x00, 0x00},

	{31, 1,  0,  0xFF, 0xFF, 4,    1,    0xFF, 0, 0x00, 0x00},

	{7,  1,  0,  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0x00, 0x00},

	{0,  0,  0,  0xFF, 0xFF, 0xFF, 0xFF, 0,    0, 0x00, 0x00},

};





static struct port_params rx_frame_params_dsd[SWR_MSTR_PORT_LEN] = {

	{3,  0,  0,  0xFF, 0xFF, 1,    0xFF, 0xFF, 1},

	{31, 0,  0,  3,    6,    7,    0,    0xFF, 0},

	{31, 11, 11, 0xFF, 0xFF, 4,    1,    0xFF, 0},

	{7,  9,  0,  0xFF, 0xFF, 0xFF, 0xFF, 1,    0},

	{3,  1,  0,  0xFF, 0xFF, 0xFF, 0xFF, 3,    0},

	{3,  0,  0,  0xFF, 0xFF, 1,    0xFF, 0xFF, 1, 0x00, 0x00},

	{31, 0,  0,  3,    6,    7,    0,    0xFF, 0, 0x00, 0x00},

	{31, 11, 11, 0xFF, 0xFF, 4,    1,    0xFF, 0, 0x00, 0x00},

	{7,  9,  0,  0xFF, 0xFF, 0xFF, 0xFF, 1,    0, 0x00, 0x00},

	{3,  1,  0,  0xFF, 0xFF, 0xFF, 0xFF, 3,    0, 0x00, 0x00},

};



static struct port_params rx_frame_params_khaje[SWR_MSTR_PORT_LEN] = {

	{3,  1,  0,  0xFF, 0xFF, 1,    0xFF, 0xFF, 0, 0x00, 0x00},

	{31, 0,  0,  3,    6,    7,    0,    0xFF, 0, 0x00, 0x00},

	{31, 11, 11, 0xFF, 0xFF, 4,    1,    0xFF, 0, 0x00, 0x00},

	{7,  1,  0,  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0x00, 0x00},

	{0,  0,  0,  0xFF, 0xFF, 0xFF, 0xFF, 0,    0, 0x00, 0x00},

};



/* TX UC1: TX1: 1ch, TX2: 2chs, TX3: 1ch(MBHC) */

static struct port_params tx_frame_params_default[SWR_MSTR_PORT_LEN] = {

	{3,  1,  0,  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0},  /* TX1 */

	{3,  2,  0,  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0},  /* TX2 */

	{3,  1,  0,  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0},  /* TX3 */

	{3,  1,  0,  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0x00, 0x00},  /* TX1 */

	{3,  2,  0,  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0x00, 0x00},  /* TX2 */

	{3,  1,  0,  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0x00, 0x00},  /* TX3 */

};



static struct port_params tx_frame_params_wcd937x[SWR_MSTR_PORT_LEN] = {

	{3, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 1, 0x00, 0x00}, /* TX1 */

	{3, 1, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0x00, 0x00}, /* TX2 */

	{3, 2, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0x00, 0x00}, /* TX3 */

};



static struct swr_mstr_port_map sm_port_map[] = {

	{VA_MACRO, SWR_UC0, tx_frame_params_default},

	{VA_MACRO, SWR_UC0, tx_frame_params_wcd937x},

	{RX_MACRO, SWR_UC0, rx_frame_params_default},

	{RX_MACRO, SWR_UC1, rx_frame_params_dsd},

};
@@ -56,4 +71,10 @@ static struct swr_mstr_port_map sm_port_map_rouleur[] = { 
	{RX_MACRO, SWR_UC0, rx_frame_params_rouleur},

	{RX_MACRO, SWR_UC1, rx_frame_params_dsd},

};



static struct swr_mstr_port_map sm_port_map_khaje[] = {

	{VA_MACRO, SWR_UC0, tx_frame_params_default},

	{RX_MACRO, SWR_UC0, rx_frame_params_khaje},

	{RX_MACRO, SWR_UC1, rx_frame_params_dsd},

};

#endif /* _BENGAL_PORT_CONFIG */

asoc/bengal.c

+10 −1
Original line number Diff line number Diff line
@@ -551,6 +551,7 @@ static struct snd_soc_codec_conf *msm_codec_conf; 
static struct snd_soc_card snd_soc_card_bengal_msm;

static int dmic_0_1_gpio_cnt;

static int dmic_2_3_gpio_cnt;

static u32 wcd_datalane_mismatch;



static void *def_wcd_mbhc_cal(void);

static void *def_rouleur_mbhc_cal(void);
@@ -4354,7 +4355,11 @@ static int msm_int_audrx_init(struct snd_soc_pcm_runtime *rtd) 
	snd_soc_dapm_ignore_suspend(dapm, "AMIC4");

	snd_soc_dapm_sync(dapm);



	if (!strncmp(component->driver->name, ROULEUR_DRV_NAME,

	if (wcd_datalane_mismatch) {

		bolero_set_port_map(component,

				ARRAY_SIZE(sm_port_map_khaje),

				sm_port_map_khaje);

	} else if (!strncmp(component->driver->name, ROULEUR_DRV_NAME,

						strlen(ROULEUR_DRV_NAME))) {

		rouleur_info_create_codec_entry(pdata->codec_root, component);

		bolero_set_port_map(bolero_component, ARRAY_SIZE(sm_port_map_rouleur), sm_port_map_rouleur);
@@ -6157,6 +6162,10 @@ static int msm_asoc_machine_probe(struct platform_device *pdev) 
		goto err;

	}



	ret = of_property_read_u32(pdev->dev.of_node,

			"qcom,wcd-datalane-mismatch",

			&wcd_datalane_mismatch);



	ret = devm_snd_soc_register_card(&pdev->dev, card);

	if (ret == -EPROBE_DEFER) {

		if (codec_reg_done)

asoc/codecs/bolero/bolero-cdc.c

+1 −1
Original line number Diff line number Diff line
@@ -509,7 +509,7 @@ static u8 bolero_dmic_clk_div_get(struct snd_soc_component *component, 


	if (priv->macro_params[macro].clk_div_get) {

		ret = priv->macro_params[macro].clk_div_get(component);

		if (ret > 0)

		if (ret >= 0)

			return ret;

	}