diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2017-05-26 01:44:19 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-05-26 12:39:07 +0100 |
| commit | e8a3ce1130134046e9da132aa4d043566df8237d (patch) | |
| tree | b55c1a9bb33bb6d070df8c5feea5a9c62b41ca14 /sound | |
| parent | 7819a942de7b993771bd9377babc80485fe7606b (diff) | |
| download | linux-e8a3ce1130134046e9da132aa4d043566df8237d.tar.bz2 | |
ASoC: rsnd: fixup parent_clk_name of AUDIO_CLKOUTx
commit 25165f79adc7 ("ASoC: rsnd: enable clock-frequency for both
44.1kHz/48kHz") supported both 44.1kHz/48kHz for AUDIO_CLKOUTx,
but it didn't care its parent clock name.
This patch fixes it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -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 66203d107a11..d3b0dc145a56 100644 --- a/sound/soc/sh/rcar/adg.c +++ b/sound/soc/sh/rcar/adg.c @@ -507,7 +507,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); } } @@ -522,7 +523,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); } } |