Commit 172b4c5c authored by Shawn Guo's avatar Shawn Guo Committed by Mark Brown
Browse files

ASoC: fsl: add audio routing for imx-sgtl5000 



Add DAPM widgets and audio routing support for imx-sgtl5000 machine
driver.

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent aa0e25ca

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

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

- ssi-controller : The phandle of the i.MX SSI 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



- mux-int-port : The internal port of the i.MX audio muxer (AUDMUX)

- mux-ext-port : The external port of the i.MX audio muxer
@@ -19,6 +40,10 @@ sound { 
	model = "imx51-babbage-sgtl5000";

	ssi-controller = <&ssi1>;

	audio-codec = <&sgtl5000>;

	audio-routing =

		"Mic Jack", "Mic Bias",

		"MIC_IN", "Mic Bias",

		"Headphone Jack", "HP_OUT";

	mux-int-port = <1>;

	mux-ext-port = <3>;

};

sound/soc/fsl/imx-sgtl5000.c

+13 −0
Original line number Diff line number Diff line
@@ -45,6 +45,14 @@ static int imx_sgtl5000_dai_init(struct snd_soc_pcm_runtime *rtd) 
	return 0;

}



static const struct snd_soc_dapm_widget imx_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 int __devinit imx_sgtl5000_probe(struct platform_device *pdev)

{

	struct device_node *np = pdev->dev.of_node;
@@ -127,10 +135,15 @@ static int __devinit imx_sgtl5000_probe(struct platform_device *pdev) 


	data->card.dev = &pdev->dev;

	ret = snd_soc_of_parse_card_name(&data->card, "model");

	if (ret)

		return ret;

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

	if (ret)

		return ret;

	data->card.num_links = 1;

	data->card.dai_link = &data->dai;

	data->card.dapm_widgets = imx_sgtl5000_dapm_widgets;

	data->card.num_dapm_widgets = ARRAY_SIZE(imx_sgtl5000_dapm_widgets);



	ret = snd_soc_register_card(&data->card);

	if (ret) {