diff options
| author | Mark Brown <broonie@kernel.org> | 2017-06-07 21:30:32 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-06-07 21:30:32 +0200 |
| commit | 9bc3b4ff18d130da09ad608718d4afcda01b3e56 (patch) | |
| tree | 46d214f42c10e8736d11bc36372d0c8c176fdca9 /sound/soc/sh/rcar/adg.c | |
| parent | ASoC: rsnd: update pointer more accurate (diff) | |
| parent | ASoC: rsnd: fixup parent_clk_name of AUDIO_CLKOUTx (diff) | |
| download | linux-9bc3b4ff18d130da09ad608718d4afcda01b3e56.tar.xz linux-9bc3b4ff18d130da09ad608718d4afcda01b3e56.zip | |
Merge branch 'fix/rcar' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-rcar
Diffstat (limited to 'sound/soc/sh/rcar/adg.c')
| -rw-r--r-- | sound/soc/sh/rcar/adg.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c index 36bece8621b7..4a72fd74ddc2 100644 --- a/sound/soc/sh/rcar/adg.c +++ b/sound/soc/sh/rcar/adg.c @@ -510,7 +510,8 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv, rbga = rbgx; adg->rbga_rate_for_441khz = rate / div; ckr |= brg_table[i] << 20; - if (req_441kHz_rate) + if (req_441kHz_rate && + !(adg_mode_flags(adg) & AUDIO_OUT_48)) parent_clk_name = __clk_get_name(clk); } } @@ -525,7 +526,8 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv, rbgb = rbgx; adg->rbgb_rate_for_48khz = rate / div; ckr |= brg_table[i] << 16; - if (req_48kHz_rate) + if (req_48kHz_rate && + (adg_mode_flags(adg) & AUDIO_OUT_48)) parent_clk_name = __clk_get_name(clk); } } |