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

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

Merge "ASoC: msm8939: add slimbus 5 tx to 9306 BE dai links"

parents ccc80175 d4086e42

Documentation/devicetree/bindings/sound/qcom-audio-dev.txt

+5 −0
Original line number Diff line number Diff line
@@ -400,6 +400,11 @@ Example: 
			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-sb-6-rx {

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

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

sound/soc/msm/msm8939-slimbus.c

+13 −0
Original line number Diff line number Diff line
@@ -1279,6 +1279,19 @@ static struct snd_soc_dai_link msm8x16_9306_dai[] = { 
		.ignore_pmdown_time = 1,

		.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 = &slimbus_be_ops,

		.ignore_suspend = 1,

	},

};



static struct snd_soc_dai_link msm8x16_9302_dai[] = {