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

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

Merge "ASoC: msm8226: Add listen in device tree and BE dai links"

parents a5fce836 ea474d94

arch/arm/boot/dts/qcom/msm8226.dtsi

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

/* Copyright (c) 2012-2014, 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
@@ -575,6 +575,11 @@ 
			qcom,msm-dai-q6-dev-id = <16393>;

		};



		qcom,msm-dai-q6-sb-5-tx {

			compatible = "qcom,msm-dai-q6-dev";

			qcom,msm-dai-q6-dev-id = <16395>;

		};



		qcom,msm-dai-q6-bt-sco-rx {

			compatible = "qcom,msm-dai-q6-dev";

			qcom,msm-dai-q6-dev-id = <12288>;

sound/soc/msm/msm8226.c

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

/* Copyright (c) 2012-2014, 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
@@ -1657,6 +1657,19 @@ static struct snd_soc_dai_link msm8226_9306_dai[] = { 
		.ops = &msm8226_be_ops,

		.ignore_suspend = 1,

	},

	{

		.name = LPASS_BE_SLIMBUS_5_TX,

		.stream_name = "Slimbus5 Capture",

		.cpu_dai_name = "msm-dai-q6-dev.16395",

		.platform_name = "msm-pcm-routing",

		.codec_name = "tapan_codec",

		.codec_dai_name	= "tapan_tx1",

		.no_pcm = 1,

		.be_id = MSM_BACKEND_DAI_SLIMBUS_5_TX,

		.be_hw_params_fixup = msm_slim_0_tx_be_hw_params_fixup,

		.ops = &msm8226_be_ops,

		.ignore_suspend = 1,

	},

};



static struct snd_soc_dai_link msm8226_9302_dai[] = {
@@ -1773,6 +1786,19 @@ static struct snd_soc_dai_link msm8226_9302_dai[] = { 
		.ops = &msm8226_be_ops,

		.ignore_suspend = 1,

	},

	{

		.name = LPASS_BE_SLIMBUS_5_TX,

		.stream_name = "Slimbus5 Capture",

		.cpu_dai_name = "msm-dai-q6-dev.16395",

		.platform_name = "msm-pcm-routing",

		.codec_name = "tapan_codec",

		.codec_dai_name	= "tapan_tx1",

		.no_pcm = 1,

		.be_id = MSM_BACKEND_DAI_SLIMBUS_5_TX,

		.be_hw_params_fixup = msm_slim_0_tx_be_hw_params_fixup,

		.ops = &msm8226_be_ops,

		.ignore_suspend = 1,

	},

};



static struct snd_soc_dai_link msm8226_9306_dai_links[