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

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

Merge 3971a6b3 on remote branch 

Change-Id: Ie212002ae57debbcf5f6084da2ca7b542fb7dd8e
parents 38a23b55 3971a6b3

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/bengal.c

+313 −873

File changed.

Preview size limit exceeded, changes collapsed.

asoc/codecs/msm_hdmi_codec_rx.c

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

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

/* Copyright (c) 2012-2021, The Linux Foundation. All rights reserved.

 */

#include <linux/platform_device.h>

#include <linux/slab.h>
@@ -222,9 +222,9 @@ static int msm_ext_disp_audio_type_get(struct snd_kcontrol *kcontrol, 
	rc = msm_ext_disp_select_audio_codec(codec_data->ext_disp_core_pdev,

						 &codec_info);



	if (!codec_data->ext_disp_ops.get_audio_edid_blk ||

	if (!codec_data->ext_disp_ops.cable_status ||

	    !codec_data->ext_disp_ops.get_intf_id || rc) {

		dev_err_ratelimited(component->dev, "%s: get_audio_edid_blk() or get_intf_id is NULL\n",

		dev_err_ratelimited(component->dev, "%s: cable_status() or get_intf_id is NULL\n",

			__func__);

		rc = -EINVAL;

		goto cable_err;

asoc/codecs/rouleur/rouleur.c

+45 −12
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

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

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

 */



#include <linux/module.h>
@@ -29,8 +29,6 @@ 
#include <linux/power_supply.h>

#include "asoc/bolero-slave-internal.h"



#define DRV_NAME "rouleur_codec"



#define NUM_SWRS_DT_PARAMS 5



#define ROULEUR_VERSION_1_0 1
@@ -42,6 +40,18 @@ 


#define FOUNDRY_ID_SEC 0x5



#define ROULEUR_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |\

			SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_48000 |\

			SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_192000 |\

			SNDRV_PCM_RATE_384000)

/* Fractional Rates */

#define ROULEUR_FRAC_RATES (SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_88200 |\

				SNDRV_PCM_RATE_176400 | SNDRV_PCM_RATE_352800)



#define ROULEUR_FORMATS (SNDRV_PCM_FMTBIT_S16_LE |\

		SNDRV_PCM_FMTBIT_S24_LE |\

		SNDRV_PCM_FMTBIT_S24_3LE | SNDRV_PCM_FMTBIT_S32_LE)



enum {

	CODEC_TX = 0,

	CODEC_RX,
@@ -97,6 +107,29 @@ static struct regmap_irq_chip rouleur_regmap_irq_chip = { 
	.irq_drv_data = NULL,

};



static struct snd_soc_dai_driver rouleur_dai[] = {

	{

		.name = "rouleur_cdc",

		.playback = {

			.stream_name = "ROULEUR_AIF Playback",

			.rates = ROULEUR_RATES | ROULEUR_FRAC_RATES,

			.formats = ROULEUR_FORMATS,

			.rate_max = 384000,

			.rate_min = 8000,

			.channels_min = 1,

			.channels_max = 2,

		},

		.capture = {

			.stream_name = "ROULEUR_AIF Capture",

			.rates = ROULEUR_RATES,

			.formats = ROULEUR_FORMATS,

			.rate_max = 192000,

			.rate_min = 8000,

			.channels_min = 1,

			.channels_max = 2,

		},

	},

};

static int rouleur_handle_post_irq(void *data)

{

	struct rouleur_priv *rouleur = data;
@@ -1764,15 +1797,15 @@ static const struct snd_soc_dapm_widget rouleur_dapm_widgets[] = { 
				SND_SOC_DAPM_POST_PMD),



	/* micbias widgets*/

	SND_SOC_DAPM_MICBIAS_E("MIC BIAS1", SND_SOC_NOPM, 0, 0,

	SND_SOC_DAPM_SUPPLY("MIC BIAS1", SND_SOC_NOPM, 0, 0,

				rouleur_codec_enable_micbias,

				SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |

				SND_SOC_DAPM_POST_PMD),

	SND_SOC_DAPM_MICBIAS_E("MIC BIAS2", SND_SOC_NOPM, 0, 0,

	SND_SOC_DAPM_SUPPLY("MIC BIAS2", SND_SOC_NOPM, 0, 0,

				rouleur_codec_enable_micbias,

				SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |

				SND_SOC_DAPM_POST_PMD),

	SND_SOC_DAPM_MICBIAS_E("MIC BIAS3", SND_SOC_NOPM, 0, 0,

	SND_SOC_DAPM_SUPPLY("MIC BIAS3", SND_SOC_NOPM, 0, 0,

				rouleur_codec_enable_micbias,

				SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |

				SND_SOC_DAPM_POST_PMD),
@@ -1842,15 +1875,15 @@ static const struct snd_soc_dapm_widget rouleur_dapm_widgets[] = { 
	SND_SOC_DAPM_OUTPUT("HPHR"),



	/* micbias pull up widgets*/

	SND_SOC_DAPM_MICBIAS_E("VA MIC BIAS1", SND_SOC_NOPM, 0, 0,

	SND_SOC_DAPM_SUPPLY("VA MIC BIAS1", SND_SOC_NOPM, 0, 0,

				rouleur_codec_enable_micbias_pullup,

				SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |

				SND_SOC_DAPM_POST_PMD),

	SND_SOC_DAPM_MICBIAS_E("VA MIC BIAS2", SND_SOC_NOPM, 0, 0,

	SND_SOC_DAPM_SUPPLY("VA MIC BIAS2", SND_SOC_NOPM, 0, 0,

				rouleur_codec_enable_micbias_pullup,

				SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |

				SND_SOC_DAPM_POST_PMD),

	SND_SOC_DAPM_MICBIAS_E("VA MIC BIAS3", SND_SOC_NOPM, 0, 0,

	SND_SOC_DAPM_SUPPLY("VA MIC BIAS3", SND_SOC_NOPM, 0, 0,

				rouleur_codec_enable_micbias_pullup,

				SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |

				SND_SOC_DAPM_POST_PMD),
@@ -1977,7 +2010,7 @@ int rouleur_info_create_codec_entry(struct snd_info_entry *codec_root, 
		return 0;

	}

	card = component->card;

	priv->entry = snd_info_create_subdir(codec_root->module,

	priv->entry = snd_info_create_module_entry(codec_root->module,

					     "rouleur", codec_root);

	if (!priv->entry) {

		dev_dbg(component->dev, "%s: failed to create rouleur entry\n",
@@ -2271,7 +2304,7 @@ static int rouleur_soc_codec_resume(struct snd_soc_component *component) 
}



static const struct snd_soc_component_driver soc_codec_dev_rouleur = {

	.name = DRV_NAME,

	.name = ROULEUR_DRV_NAME,

	.probe = rouleur_soc_codec_probe,

	.remove = rouleur_soc_codec_remove,

	.controls = rouleur_snd_controls,
@@ -2682,7 +2715,7 @@ static int rouleur_bind(struct device *dev) 
	wcd_disable_irq(&rouleur->irq_info, ROULEUR_IRQ_HPHL_PDM_WD_INT);



	ret = snd_soc_register_component(dev, &soc_codec_dev_rouleur,

				     NULL, 0);

				     rouleur_dai, ARRAY_SIZE(rouleur_dai));

	if (ret) {

		dev_err(dev, "%s: Codec registration failed\n",

				__func__);

asoc/codecs/rouleur/rouleur.h

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

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

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

 */



#ifndef _ROULEUR_H

#define _ROULEUR_H



#define ROULEUR_DRV_NAME "rouleur_codec"



#ifdef CONFIG_SND_SOC_ROULEUR

extern int rouleur_info_create_codec_entry(struct snd_info_entry *codec_root,

				    struct snd_soc_component *component);