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

Commit 87b91e5f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: qdsp6v2: Remove Eagle code"

parents 726d3213 fef7d6f1

include/sound/apr_audio-v2.h

+12 −0
Original line number Diff line number Diff line
@@ -16,6 +16,18 @@ 


#include <linux/qdsp6v2/apr.h>



/* size of header needed for passing data out of band */

#define APR_CMD_OB_HDR_SZ  12



/* size of header needed for getting data */

#define APR_CMD_GET_HDR_SZ 16



struct param_outband {

        size_t       size;

        void        *kvaddr;

        phys_addr_t  paddr;

};



#define ADSP_ADM_VERSION    0x00070000



#define ADM_CMD_SHARED_MEM_MAP_REGIONS    0x00010322

include/sound/q6adm-v2.h

+1 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2017, 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
@@ -34,7 +34,6 @@ enum { 
	ADM_AUDVOL_CAL,

	ADM_RTAC_INFO_CAL,

	ADM_RTAC_APR_CAL,

	ADM_DTS_EAGLE,

	ADM_SRS_TRUMEDIA,

	ADM_MAX_CAL_TYPES

};

sound/soc/msm/qdsp6v2/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ snd-soc-qdsp6v2-objs += msm-dai-q6-v2.o msm-pcm-q6-v2.o msm-pcm-routing-v2.o \ 
obj-$(CONFIG_SND_SOC_QDSP6V2) += snd-soc-qdsp6v2.o msm-pcm-dtmf-v2.o \

				 msm-dai-stub-v2.o

obj-$(CONFIG_SND_HWDEP) += msm-pcm-routing-devdep.o

obj-$(CONFIG_DTS_EAGLE) += msm-dts-eagle.o

obj-$(CONFIG_DOLBY_DAP) += msm-dolby-dap-config.o

obj-$(CONFIG_DOLBY_DS2) += msm-ds2-dap-config.o

obj-$(CONFIG_DTS_SRS_TM) += msm-dts-srs-tm-config.o

sound/soc/msm/qdsp6v2/audio_cal_utils.c

+0 −4
Original line number Diff line number Diff line
@@ -128,8 +128,6 @@ size_t get_cal_info_size(int32_t cal_type) 
	case ULP_LSM_CAL_TYPE:

		size = sizeof(struct audio_cal_info_lsm);

		break;

	case DTS_EAGLE_CAL_TYPE:

		size = 0;

	case AUDIO_CORE_METAINFO_CAL_TYPE:

		size = sizeof(struct audio_cal_info_metainfo);

		break;
@@ -247,8 +245,6 @@ size_t get_user_cal_type_size(int32_t cal_type) 
	case ULP_LSM_CAL_TYPE:

		size = sizeof(struct audio_cal_type_lsm);

		break;

	case DTS_EAGLE_CAL_TYPE:

		size = 0;

	case AUDIO_CORE_METAINFO_CAL_TYPE:

		size = sizeof(struct audio_cal_type_metainfo);

		break;

sound/soc/msm/qdsp6v2/msm-audio-effects-q6-v2.c

+1 −20
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2017, 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
@@ -45,25 +45,6 @@ bool msm_audio_effects_is_effmodule_supp_in_top(int effect_module, 
	case EQ_MODULE:

		switch (topology) {

		case ASM_STREAM_POSTPROC_TOPO_ID_SA_PLUS:

		case ASM_STREAM_POSTPROC_TOPO_ID_HPX_PLUS:

		case ASM_STREAM_POSTPROC_TOPO_ID_HPX_MASTER:

			return true;

		default:

			return false;

		}

	case DTS_EAGLE_MODULE:

		switch (topology) {

		case ASM_STREAM_POSTPROC_TOPO_ID_DTS_HPX:

		case ASM_STREAM_POSTPROC_TOPO_ID_HPX_PLUS:

		case ASM_STREAM_POSTPROC_TOPO_ID_HPX_MASTER:

			return true;

		default:

			return false;

		}

	case SOFT_VOLUME2_MODULE:

		switch (topology) {

		case ASM_STREAM_POSTPROC_TOPO_ID_HPX_PLUS:

		case ASM_STREAM_POSTPROC_TOPO_ID_HPX_MASTER:

			return true;

		default:

			return false;