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

Commit 449fef74 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: msm: enable DAP set license logic on 8998" into msm-4.9

parents 9f9e3693 194ef0ed

sound/soc/msm/Kconfig

+10 −1
Original line number Diff line number Diff line
@@ -50,6 +50,15 @@ config DOLBY_DS2 
	 device, end point dependent post processing parameters and

	 the various posrt processing parameters



config DOLBY_LICENSE

	bool "Enable Dolby LICENSE"

	depends on SND_SOC_MSM_QDSP6V2_INTF

	help

	 To add support for dolby DAP post processing,

	 and retain DAP set license functionality only.

	 This is required by Dolby GEF implementation which needs

	 nothing but dolby license validation functionality in driver.



config DTS_EAGLE

	bool "Enable DTS Eagle Support"

	depends on SND_SOC_MSM_QDSP6V2_INTF
@@ -211,7 +220,7 @@ config SND_SOC_MSM8998 
	select QTI_PP

	select SND_SOC_CPE

	select MSM_ULTRASOUND

	select DOLBY_DS2

	select DOLBY_LICENSE

	select SND_HWDEP

        select DTS_EAGLE

	help

sound/soc/msm/qdsp6v2/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 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_DOLBY_LICENSE) += msm-ds2-dap-config.o

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

obj-$(CONFIG_QTI_PP) += msm-qti-pp-config.o

obj-y += audio_calibration.o audio_cal_utils.o q6adm.o q6afe.o q6asm.o \

sound/soc/msm/qdsp6v2/msm-ds2-dap-config.c

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <sound/q6core.h>





#ifdef CONFIG_DOLBY_DS2

#if defined(CONFIG_DOLBY_DS2) || defined(CONFIG_DOLBY_LICENSE)



/* ramp up/down for 30ms    */

#define DOLBY_SOFT_VOLUME_PERIOD	40
@@ -2296,4 +2296,4 @@ int msm_ds2_dap_ioctl_shared(struct snd_hwdep *hw, struct file *file, 
{

	return 0;

}

#endif /*CONFIG_DOLBY_DS2*/
 
#endif /* CONFIG_DOLBY_DS2 || CONFIG_DOLBY_LICENSE */

sound/soc/msm/qdsp6v2/msm-ds2-dap-config.h

+3 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ struct dolby_param_license32 { 
		_IOR('U', 0x15, struct dolby_param_data32)

#endif



#ifdef CONFIG_DOLBY_DS2

#if defined(CONFIG_DOLBY_DS2) || defined(CONFIG_DOLBY_LICENSE)

/* DOLBY DOLBY GUIDS */

#define DS2_MODULE_ID			0x00010775
@@ -86,10 +86,11 @@ int msm_ds2_dap_set_custom_stereo_onoff(int port_id, int copp_idx, 
/* Dolby DOLBY end */

#else



static inline void msm_ds2_dap_update_port_parameters(struct snd_hwdep *hw,

static inline int msm_ds2_dap_update_port_parameters(struct snd_hwdep *hw,

					       struct file *file,

					       bool open)

{

	return 0;

}



static inline int msm_ds2_dap_ioctl(struct snd_hwdep *hw, struct file *file,

sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c

+10 −0
Original line number Diff line number Diff line
@@ -46,6 +46,16 @@ 
#include "q6voice.h"

#include "sound/q6lsm.h"



#ifndef CONFIG_DOLBY_DAP

#undef DOLBY_ADM_COPP_TOPOLOGY_ID

#define DOLBY_ADM_COPP_TOPOLOGY_ID 0xFFFFFFFE

#endif



#ifndef CONFIG_DOLBY_DS2

#undef DS2_ADM_COPP_TOPOLOGY_ID

#define DS2_ADM_COPP_TOPOLOGY_ID 0xFFFFFFFF

#endif



static int get_cal_path(int path_type);



static struct mutex routing_lock;