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

Unverified Commit 949293d4 authored by Christian Fischer's avatar Christian Fischer Committed by Mark Brown
Browse files

ASoC: mxs-sgtl5000: add audio-routing support 



Add dapm_widgets to machine-driver (from imx-sgtl5000).
If the "audio-routing"-property is present at probing the dapm-widgets
getting linked to the card.

Signed-off-by: default avatarChristian Fischer <fischerc@swissphone.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 4fbd8d19

Documentation/devicetree/bindings/sound/mxs-audio-sgtl5000.txt

+29 −4
Original line number Diff line number Diff line
@@ -5,6 +5,27 @@ Required properties: 
- model			: The user-visible name of this sound complex

- saif-controllers	: The phandle list of the MXS SAIF controller

- audio-codec		: The phandle of the SGTL5000 audio codec

- audio-routing		: A list of the connections between audio components.

			  Each entry is a pair of strings, the first being the

			  connection's sink, the second being the connection's

			  source. Valid names could be power supplies, SGTL5000

			  pins, and the jacks on the board:



			  Power supplies:

			   * Mic Bias



			  SGTL5000 pins:

			   * MIC_IN

			   * LINE_IN

			   * HP_OUT

			   * LINE_OUT



			  Board connectors:

			   * Mic Jack

			   * Line In Jack

			   * Headphone Jack

			   * Line Out Jack

			   * Ext Spk



Example:
@@ -14,4 +35,8 @@ sound { 
	model = "imx28-evk-sgtl5000";

	saif-controllers = <&saif0 &saif1>;

	audio-codec = <&sgtl5000>;

	audio-routing =

		"MIC_IN", "Mic Jack",

		"Mic Jack", "Mic Bias",

		"Headphone Jack", "HP_OUT";

};

sound/soc/mxs/mxs-sgtl5000.c

+20 −0
Original line number Diff line number Diff line
@@ -93,6 +93,14 @@ static struct snd_soc_dai_link mxs_sgtl5000_dai[] = { 
	},

};



static const struct snd_soc_dapm_widget mxs_sgtl5000_dapm_widgets[] = {

	SND_SOC_DAPM_MIC("Mic Jack", NULL),

	SND_SOC_DAPM_LINE("Line In Jack", NULL),

	SND_SOC_DAPM_HP("Headphone Jack", NULL),

	SND_SOC_DAPM_SPK("Line Out Jack", NULL),

	SND_SOC_DAPM_SPK("Ext Spk", NULL),

};



static struct snd_soc_card mxs_sgtl5000 = {

	.name		= "mxs_sgtl5000",

	.owner		= THIS_MODULE,
@@ -141,6 +149,18 @@ static int mxs_sgtl5000_probe(struct platform_device *pdev) 


	card->dev = &pdev->dev;



	if (of_find_property(np, "audio-routing", NULL)) {

		card->dapm_widgets = mxs_sgtl5000_dapm_widgets;

		card->num_dapm_widgets = ARRAY_SIZE(mxs_sgtl5000_dapm_widgets);



		ret = snd_soc_of_parse_audio_routing(card, "audio-routing");

		if (ret) {

			dev_err(&pdev->dev, "failed to parse audio-routing (%d)\n",

				ret);

			return ret;

		}

	}



	ret = devm_snd_soc_register_card(&pdev->dev, card);

	if (ret) {

		dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n",