Commit 398fa30b authored by Katsuhiro Suzuki's avatar Katsuhiro Suzuki Committed by Mark Brown

ASoC: uniphier: fix broken sound if use SRC in replay

This patch fixes settings for ports with SRC. These ports need to
set the fixed audio rate and clock. If not, the SRC outputs broken
sound.
Signed-off-by: default avatarKatsuhiro Suzuki <suzuki.katsuhiro@socionext.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 24745dca
...@@ -501,7 +501,7 @@ int aio_port_set_clk(struct uniphier_aio_sub *sub) ...@@ -501,7 +501,7 @@ int aio_port_set_clk(struct uniphier_aio_sub *sub)
OPORTMXCTR2_MSSEL_MASTER | OPORTMXCTR2_MSSEL_MASTER |
OPORTMXCTR2_EXTLSIFSSEL_36 | OPORTMXCTR2_EXTLSIFSSEL_36 |
OPORTMXCTR2_DACCKSEL_1_2; OPORTMXCTR2_DACCKSEL_1_2;
} else { } else if (sub->swm->type == PORT_TYPE_SPDIF) {
if (sub->aio->pll_out >= ARRAY_SIZE(v_pll)) { if (sub->aio->pll_out >= ARRAY_SIZE(v_pll)) {
dev_err(dev, "PLL(%d) is invalid\n", dev_err(dev, "PLL(%d) is invalid\n",
sub->aio->pll_out); sub->aio->pll_out);
...@@ -521,6 +521,11 @@ int aio_port_set_clk(struct uniphier_aio_sub *sub) ...@@ -521,6 +521,11 @@ int aio_port_set_clk(struct uniphier_aio_sub *sub)
v |= OPORTMXCTR2_EXTLSIFSSEL_24; v |= OPORTMXCTR2_EXTLSIFSSEL_24;
break; break;
} }
} else {
v = OPORTMXCTR2_ACLKSEL_A1 |
OPORTMXCTR2_MSSEL_MASTER |
OPORTMXCTR2_EXTLSIFSSEL_36 |
OPORTMXCTR2_DACCKSEL_1_2;
} }
regmap_write(r, OPORTMXCTR2(sub->swm->oport.map), v); regmap_write(r, OPORTMXCTR2(sub->swm->oport.map), v);
} else { } else {
...@@ -550,11 +555,19 @@ int aio_port_set_param(struct uniphier_aio_sub *sub, int pass_through, ...@@ -550,11 +555,19 @@ int aio_port_set_param(struct uniphier_aio_sub *sub, int pass_through,
const struct snd_pcm_hw_params *params) const struct snd_pcm_hw_params *params)
{ {
struct regmap *r = sub->aio->chip->regmap; struct regmap *r = sub->aio->chip->regmap;
unsigned int rate;
u32 v; u32 v;
int ret; int ret;
if (!pass_through) { if (!pass_through) {
ret = aio_port_set_rate(sub, params_rate(params)); if (sub->swm->type == PORT_TYPE_EVE ||
sub->swm->type == PORT_TYPE_CONV) {
rate = 48000;
} else {
rate = params_rate(params);
}
ret = aio_port_set_rate(sub, rate);
if (ret) if (ret)
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment