Merge "ASoC: msm: Add ASM loopback support for HFP RX" (dc1cf054) · Commits · e / devices / android_kernel_xiaomi_markw

sound/soc/msm/msm8952.c

+18 −0

Original line number	Diff line number	Diff line
		@@ -2204,6 +2204,24 @@ static struct snd_soc_dai_link msm8952_dai[] = {
		.codec_name = "snd-soc-dummy",
		.be_id = MSM_FRONTEND_DAI_VOICEMMODE2,
		},
		{/* hw:x,36 */
		.name = "MSM8916 HFP Loopback2",
		.stream_name = "MultiMedia8",
		.cpu_dai_name = "MultiMedia8",
		.platform_name = "msm-pcm-loopback",
		.dynamic = 1,
		.dpcm_playback = 1,
		.dpcm_capture = 1,
		.codec_dai_name = "snd-soc-dummy-dai",
		.codec_name = "snd-soc-dummy",
		.trigger = {SND_SOC_DPCM_TRIGGER_POST,
		SND_SOC_DPCM_TRIGGER_POST},
		.ignore_suspend = 1,
		.no_host_mode = SND_SOC_DAI_LINK_NO_HOST,
		/* this dai link has playback support */
		.ignore_pmdown_time = 1,
		.be_id = MSM_FRONTEND_DAI_MULTIMEDIA8,
		},
		/* Backend I2S DAI Links */
		{
		.name = LPASS_BE_PRI_MI2S_RX,

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

+39 −17

Original line number	Diff line number	Diff line
		/* Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2013-2016, 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
		@@ -33,6 +33,12 @@
		static const DECLARE_TLV_DB_LINEAR(loopback_rx_vol_gain, 0,
		LOOPBACK_VOL_MAX_STEPS);

		enum {
		LOOPBACK_SESSION_1,
		LOOPBACK_SESSION_2,
		LOOPBACK_SESSION_MAX,
		};

		struct msm_pcm_loopback {
		struct snd_pcm_substream *playback_substream;
		struct snd_pcm_substream *capture_substream;
		@@ -51,6 +57,10 @@ struct msm_pcm_loopback {
		int volume;
		};

		struct loopback_info {
		struct msm_pcm_loopback loop[LOOPBACK_SESSION_MAX];
		};

		static void stop_pcm(struct msm_pcm_loopback *pcm);

		static void msm_pcm_route_event_handler(enum msm_pcm_routing_event event,
		@@ -116,13 +126,22 @@ static int msm_pcm_open(struct snd_pcm_substream *substream)
		struct snd_pcm_runtime *runtime = substream->runtime;
		struct snd_soc_pcm_runtime *rtd = snd_pcm_substream_chip(substream);
		struct msm_pcm_loopback *pcm;
		struct loopback_info *loopback_info;
		int ret = 0;
		uint16_t bits_per_sample = 16;
		struct msm_pcm_routing_evt event;
		struct asm_session_mtmx_strtr_param_window_v2_t asm_mtmx_strtr_window;
		uint32_t param_id;

		pcm = dev_get_drvdata(rtd->platform->dev);
		dev_dbg(rtd->platform->dev, "%s: stream name: %s\n", __func__,
		rtd->dai_link->stream_name);

		loopback_info = dev_get_drvdata(rtd->platform->dev);
		if (!strcmp(rtd->dai_link->stream_name, "MultiMedia6"))
		pcm = &loopback_info->loop[LOOPBACK_SESSION_1];
		else
		pcm = &loopback_info->loop[LOOPBACK_SESSION_2];

		mutex_lock(&pcm->lock);

		pcm->volume = 0x2000;
		@@ -368,32 +387,35 @@ static struct snd_soc_platform_driver msm_soc_platform = {

		static int msm_pcm_probe(struct platform_device *pdev)
		{
		struct msm_pcm_loopback *pcm;

		struct loopback_info *loopback;
		int i = 0;

		dev_dbg(&pdev->dev, "%s: dev name %s\n",
		__func__, dev_name(&pdev->dev));

		pcm = kzalloc(sizeof(struct msm_pcm_loopback), GFP_KERNEL);
		if (!pcm) {
		dev_err(&pdev->dev, "%s Failed to allocate memory for pcm\n",
		__func__);
		loopback = kzalloc(sizeof(struct loopback_info), GFP_KERNEL);
		if (!loopback)
		return -ENOMEM;
		} else {
		mutex_init(&pcm->lock);
		dev_set_drvdata(&pdev->dev, pcm);
		}

		for (i = 0; i < LOOPBACK_SESSION_MAX; i++)
		mutex_init(&loopback->loop[i].lock);

		dev_set_drvdata(&pdev->dev, loopback);
		return snd_soc_register_platform(&pdev->dev,
		&msm_soc_platform);
		}

		static int msm_pcm_remove(struct platform_device *pdev)
		{
		struct msm_pcm_loopback *pcm;

		pcm = dev_get_drvdata(&pdev->dev);
		mutex_destroy(&pcm->lock);
		kfree(pcm);
		struct loopback_info *loopback;
		int i = 0;

		loopback = dev_get_drvdata(&pdev->dev);
		if (loopback) {
		for (i = 0; i < LOOPBACK_SESSION_MAX; i++)
		mutex_destroy(&loopback->loop[i].lock);
		kfree(loopback);
		}

		snd_soc_unregister_platform(&pdev->dev);
		return 0;