| From b12b392f643bed70c859a953ca4ff8c5c3a8bf42 Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Fri, 26 May 2017 01:44:19 +0000 |
| Subject: [PATCH 105/286] 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> |
| (cherry picked from commit e8a3ce1130134046e9da132aa4d043566df8237d) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| sound/soc/sh/rcar/adg.c | 6 ++++-- |
| 1 file changed, 4 insertions(+), 2 deletions(-) |
| |
| --- 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 r |
| 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 r |
| 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); |
| } |
| } |
