Merge "ASoC: Enable config for ASphere" into audio-drivers.lnx.2.0 (de79df4f) · Commits · e / devices / android_kernel_fairphone_FP3

asoc/msm-qti-pp-config.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -232,7 +232,7 @@ static int msm_qti_pp_put_eq_band_audio_mixer(struct snd_kcontrol *kcontrol,
		return 0;
		}

		#ifdef CONFIG_QTI_PP
		#if IS_ENABLED(CONFIG_QTI_PP)
		void msm_qti_pp_send_eq_values(int fedai_id)
		{
		if (eq_data[fedai_id].enable)
		@@ -753,7 +753,7 @@ static int msm_qti_pp_asphere_send_params(int port_id, int copp_idx, bool force)
		return 0;
		}

		#if defined(CONFIG_QTI_PP) && defined(CONFIG_QTI_PP_AUDIOSPHERE)
		#if IS_ENABLED(CONFIG_QTI_PP) && IS_ENABLED(CONFIG_QTI_PP_AUDIOSPHERE)
		int msm_qti_pp_asphere_init(int port_id, int copp_idx)
		{
		int index = adm_validate_and_get_port_index(port_id);
		@@ -1386,7 +1386,7 @@ static const struct snd_kcontrol_new asphere_mixer_controls[] = {
		0xFFFFFFFF, 0, 2, msm_qti_pp_asphere_get, msm_qti_pp_asphere_set),
		};

		#ifdef CONFIG_QTI_PP
		#if IS_ENABLED(CONFIG_QTI_PP)
		void msm_qti_pp_add_controls(struct snd_soc_platform *platform)
		{
		snd_soc_add_platform_controls(platform, int_fm_vol_mixer_controls,

+3 −4

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.
		* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		* only version 2 as published by the Free Software Foundation.
		@@ -15,7 +15,7 @@

		#include <sound/soc.h>
		#define DSP_BIT_WIDTH_MIXER_CTL "ASM Bit Width"
		#ifdef CONFIG_QTI_PP
		#if IS_ENABLED(CONFIG_QTI_PP)
		int msm_adsp_inform_mixer_ctl(struct snd_soc_pcm_runtime *rtd,
		uint32_t *payload);
		int msm_adsp_init_mixer_ctl_pp_event_queue(struct snd_soc_pcm_runtime *rtd);
		@@ -78,8 +78,7 @@ static inline int msm_adsp_stream_callback_info(struct snd_kcontrol *kcontrol,
		#define msm_qti_pp_add_controls(platform) do {} while (0)
		#endif /* CONFIG_QTI_PP */


		#if defined(CONFIG_QTI_PP) && defined(CONFIG_QTI_PP_AUDIOSPHERE)
		#if IS_ENABLED(CONFIG_QTI_PP) && IS_ENABLED(CONFIG_QTI_PP_AUDIOSPHERE)
		int msm_qti_pp_asphere_init(int port_id, int copp_idx);
		void msm_qti_pp_asphere_deinit(int port_id);
		#else

+1 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ CONFIG_WCD9XXX_CODEC_CORE=m
		CONFIG_MSM_CDC_PINCTRL=m
		CONFIG_SND_SOC_WCD_MBHC_LEGACY=m
		CONFIG_QTI_PP=m
		CONFIG_QTI_PP_AUDIOSPHERE=m
		CONFIG_SND_HWDEP_ROUTING=m
		CONFIG_DTS_EAGLE=m
		CONFIG_DOLBY_DS2=m

+1 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@
		#define CONFIG_SND_SOC_QDSP6V2 1
		#define CONFIG_SND_SOC_MSM_QDSP6V2_INTF 1
		#define CONFIG_QTI_PP 1
		#define CONFIG_QTI_PP_AUDIOSPHERE 1
		#define CONFIG_SND_HWDEP_ROUTING 1
		#define CONFIG_DTS_EAGLE 1
		#define CONFIG_DOLBY_DS2 1

+1 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ CONFIG_MSM_CDC_PINCTRL=m
		CONFIG_SND_SOC_WCD_MBHC_ADC=m
		CONFIG_SND_SOC_WCD_MBHC_LEGACY=m
		CONFIG_QTI_PP=m
		CONFIG_QTI_PP_AUDIOSPHERE=m
		CONFIG_SND_HWDEP_ROUTING=m
		CONFIG_DTS_EAGLE=m
		CONFIG_DOLBY_DS2=m