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: Sebastian Reichel <sre@kernel.org> Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
parent
a7d5202855
commit
0a17a37046
sound/soc/omap
@ -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(2);
|
||||||
OMAP_MCBSP_ST_CONTROLS(3);
|
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 snd_soc_dai *cpu_dai = rtd->cpu_dai;
|
||||||
struct omap_mcbsp *mcbsp = snd_soc_dai_get_drvdata(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;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (mcbsp->id) {
|
switch (port_id) {
|
||||||
case 2: /* McBSP 2 */
|
case 2: /* McBSP 2 */
|
||||||
return snd_soc_add_dai_controls(cpu_dai,
|
return snd_soc_add_dai_controls(cpu_dai,
|
||||||
omap_mcbsp2_st_controls,
|
omap_mcbsp2_st_controls,
|
||||||
@ -713,6 +713,7 @@ int omap_mcbsp_st_add_controls(struct snd_soc_pcm_runtime *rtd)
|
|||||||
omap_mcbsp3_st_controls,
|
omap_mcbsp3_st_controls,
|
||||||
ARRAY_SIZE(omap_mcbsp3_st_controls));
|
ARRAY_SIZE(omap_mcbsp3_st_controls));
|
||||||
default:
|
default:
|
||||||
|
dev_err(mcbsp->dev, "Port %d not supported\n", port_id);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -39,6 +39,6 @@ enum omap_mcbsp_div {
|
|||||||
OMAP_MCBSP_CLKGDV, /* Sample rate generator divider */
|
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
|
#endif
|
||||||
|
@ -297,7 +297,7 @@ static int rx51_aic34_init(struct snd_soc_pcm_runtime *rtd)
|
|||||||
return err;
|
return err;
|
||||||
snd_soc_limit_volume(codec, "TPA6130A2 Headphone Playback Volume", 42);
|
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)
|
if (err < 0)
|
||||||
return err;
|
return err;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user