Commit 0a17a370 authored by Sebastian Reichel's avatar Sebastian Reichel Committed by Mark Brown
Browse files

ASoC: omap: rx51: omap_mcbsp_st_add_controls: add id parameter 



This is a preparation for DT based booting where the McBSP id
is set to -1 for all McBSP instances.

Signed-off-by: default avatarSebastian Reichel <sre@kernel.org>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent a7d52028

sound/soc/omap/omap-mcbsp.c

+3 −2
Original line number Diff line number Diff line
@@ -693,7 +693,7 @@ OMAP_MCBSP_SOC_SINGLE_S16_EXT("McBSP" #port " Sidetone Channel 1 Volume", \ 
OMAP_MCBSP_ST_CONTROLS(2);

OMAP_MCBSP_ST_CONTROLS(3);



int omap_mcbsp_st_add_controls(struct snd_soc_pcm_runtime *rtd)

int omap_mcbsp_st_add_controls(struct snd_soc_pcm_runtime *rtd, int port_id)

{

	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

	struct omap_mcbsp *mcbsp = snd_soc_dai_get_drvdata(cpu_dai);
@@ -703,7 +703,7 @@ int omap_mcbsp_st_add_controls(struct snd_soc_pcm_runtime *rtd) 
		return 0;

	}



	switch (mcbsp->id) {

	switch (port_id) {

	case 2: /* McBSP 2 */

		return snd_soc_add_dai_controls(cpu_dai,

					omap_mcbsp2_st_controls,
@@ -713,6 +713,7 @@ int omap_mcbsp_st_add_controls(struct snd_soc_pcm_runtime *rtd) 
					omap_mcbsp3_st_controls,

					ARRAY_SIZE(omap_mcbsp3_st_controls));

	default:

		dev_err(mcbsp->dev, "Port %d not supported\n", port_id);

		break;

	}

sound/soc/omap/omap-mcbsp.h

+1 −1
Original line number Diff line number Diff line
@@ -39,6 +39,6 @@ enum omap_mcbsp_div { 
	OMAP_MCBSP_CLKGDV,		/* Sample rate generator divider */

};



int omap_mcbsp_st_add_controls(struct snd_soc_pcm_runtime *rtd);

int omap_mcbsp_st_add_controls(struct snd_soc_pcm_runtime *rtd, int port_id);



#endif

sound/soc/omap/rx51.c

+1 −1
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ static int rx51_aic34_init(struct snd_soc_pcm_runtime *rtd) 
		return err;

	snd_soc_limit_volume(codec, "TPA6130A2 Headphone Playback Volume", 42);



	err = omap_mcbsp_st_add_controls(rtd);

	err = omap_mcbsp_st_add_controls(rtd, 2);

	if (err < 0)

		return err;