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

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

Merge e3766898 on remote branch 

Change-Id: If4fc140f3a69b7f4aeb3c6d5652b114012150d67
parents 9865ae25 e3766898

Makefile.am

+49 −0
Original line number Diff line number Diff line 
AUDIO_ROOT=$(PWD)

UAPI_OUT=$(PWD)

KERNEL_BINARY_DIR=$(KERNEL_SRC)/../kernel-build-artifacts



KBUILD_OPTIONS := AUDIO_ROOT=$(PWD)

KBUILD_OPTIONS += MODNAME=audio
@@ -11,6 +12,9 @@ endif 
ifeq ($(TARGET_SUPPORT), sdmsteppe)

KBUILD_OPTIONS += CONFIG_ARCH_SM6150=y

endif

ifeq ($(TARGET_SUPPORT), qrbx210)

KBUILD_OPTIONS += CONFIG_ARCH_BENGAL=y

endif



subdir-ccflags-y += -I$(AUDIO_ROOT)/include/uapi/
@@ -28,6 +32,12 @@ obj-m += asoc/codecs/bolero/ 
obj-m += asoc/codecs/csra66x0/

obj-m += asoc/codecs/ep92/

endif

ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), qrbx210))

obj-m += asoc/codecs/rouleur/

obj-m += asoc/codecs/bolero/

obj-m += asoc/codecs/wcd937x/

KBUILD_CFLAGS += -Wno-error

endif

ifeq ($(TARGET_SUPPORT), sdmsteppe)

obj-m += asoc/codecs/bolero/

obj-m += asoc/codecs/wcd937x/
@@ -63,6 +73,45 @@ all: 
	$(shell ln -s $(KERNEL_SRC)/drivers/pinctrl/pinctrl-utils.h $(shell pwd)/soc/pinctrl-utils.h)

	$(shell rm -fr $(shell pwd)/include/soc/qcom/secure_buffer.h)

	$(shell ln -s $(KERNEL_SRC)/include/soc/qcom/secure_buffer.h $(shell pwd)/include/soc/qcom/secure_buffer.h)

	$(shell mkdir -p $(shell pwd)/linux)

	$(shell mkdir -p $(shell pwd)/sound)

	$(shell mkdir -p $(shell pwd)/linux/mfd)

	$(shell mkdir -p $(shell pwd)/linux/mfd/wcd9xxx)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

	$(shell cd $(KERNEL_BINARY_DIR) && $(KERNEL_SRC)/scripts/headers_install.sh $(AUDIO_ROOT)/include/uapi/audio/linux/wcd-spi-ac-params.h $(UAPI_OUT)/linux/wcd-spi-ac-params.h)

	$(shell cd $(KERNEL_BINARY_DIR) && $(KERNEL_SRC)/scripts/headers_install.sh $(AUDIO_ROOT)/include/uapi/audio/linux/mfd/wcd9xxx/wcd9320_registers.h $(UAPI_OUT)/linux/mfd/wcd9xxx/wcd9320_registers.h)

	$(shell cd $(KERNEL_BINARY_DIR) && $(KERNEL_SRC)/scripts/headers_install.sh $(AUDIO_ROOT)/include/uapi/audio/linux/mfd/wcd9xxx/wcd9xxx_registers.h $(UAPI_OUT)/linux/mfd/wcd9xxx/wcd9xxx_registers.h)

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

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

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

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

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

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

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



modules_install:

asoc/Kbuild

100755 → 100644
+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ 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

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

+321 −872

File changed.

Preview size limit exceeded, changes collapsed.

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;

	}