ASoC: Blackfin AC97: add a few missing multichannel define handling
Somewhere along the line, most of SND_BF5XX_MULTICHAN_SUPPORT handling was merged, but two places were missed (the probe/resume functions). Restore handling of this option so it gets initialized properly. Signed-off-by: Cliff Cai <cliff.cai@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>hifive-unleashed-5.1
parent
d4e54e871f
commit
79dfc96876
|
@ -277,7 +277,11 @@ static int bf5xx_ac97_resume(struct snd_soc_dai *dai)
|
||||||
if (!dai->active)
|
if (!dai->active)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
#if defined(CONFIG_SND_BF5XX_MULTICHAN_SUPPORT)
|
||||||
|
ret = sport_set_multichannel(sport, 16, 0x3FF, 1);
|
||||||
|
#else
|
||||||
ret = sport_set_multichannel(sport, 16, 0x1F, 1);
|
ret = sport_set_multichannel(sport, 16, 0x1F, 1);
|
||||||
|
#endif
|
||||||
if (ret) {
|
if (ret) {
|
||||||
pr_err("SPORT is busy!\n");
|
pr_err("SPORT is busy!\n");
|
||||||
return -EBUSY;
|
return -EBUSY;
|
||||||
|
@ -334,7 +338,11 @@ static int bf5xx_ac97_probe(struct platform_device *pdev,
|
||||||
goto sport_err;
|
goto sport_err;
|
||||||
}
|
}
|
||||||
/*SPORT works in TDM mode to simulate AC97 transfers*/
|
/*SPORT works in TDM mode to simulate AC97 transfers*/
|
||||||
|
#if defined(CONFIG_SND_BF5XX_MULTICHAN_SUPPORT)
|
||||||
|
ret = sport_set_multichannel(sport_handle, 16, 0x3FF, 1);
|
||||||
|
#else
|
||||||
ret = sport_set_multichannel(sport_handle, 16, 0x1F, 1);
|
ret = sport_set_multichannel(sport_handle, 16, 0x1F, 1);
|
||||||
|
#endif
|
||||||
if (ret) {
|
if (ret) {
|
||||||
pr_err("SPORT is busy!\n");
|
pr_err("SPORT is busy!\n");
|
||||||
ret = -EBUSY;
|
ret = -EBUSY;
|
||||||
|
|
Loading…
Reference in New Issue