clk: tegra: Fix initial rate for pll_a on Tegra124
Subsystems (3)
PATCH 1/1 clk: tegra: Fix initial rate for pll_a on Tegra124
From: Thierry Reding <[email protected]>
pll_a_out0 and the I2S clocks are already configured to default to rates corresponding to a 44.1 kHz sampling rate, but the pll_a configuration was set to a default that is not listed in the frequency table, which caused the PLL code to compute an invalid configuration. As a result of this invalid configuration, Jetson TK1 fails to resume from suspend.
This used to get papered over because the ASoC driver would force audio clocks to a 44.1 kHz configuration on boot. However, that's not really necessary and was hence removed in commit ff5d18cb04f4 ("ASoC: tegra:
Enable audio mclk during tegra_asoc_utils_init()").
Fix the initial rate for pll_a so that it matches the 44.1 kHz entry in the pll_a frequency table.
---
Mike, Stephen,
this fixes a regression in v5.7, so it'd be great if you could queue it up in your fixes branch.
Thanks,
Thierry
drivers/clk/tegra/clk-tegra124.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/tegra/clk-tegra124.c +1 -1
@@ -1292,7 +1292,7 @@ static struct tegra_clk_init_table common_init_table[] __initdata = { { TEGRA124_CLK_UARTB, TEGRA124_CLK_PLL_P, 408000000, 0 }, { TEGRA124_CLK_UARTC, TEGRA124_CLK_PLL_P, 408000000, 0 }, { TEGRA124_CLK_UARTD, TEGRA124_CLK_PLL_P, 408000000, 0 }, - { TEGRA124_CLK_PLL_A, TEGRA124_CLK_CLK_MAX, 564480000, 0 }, + { TEGRA124_CLK_PLL_A, TEGRA124_CLK_CLK_MAX, 282240000, 0 }, { TEGRA124_CLK_PLL_A_OUT0, TEGRA124_CLK_CLK_MAX, 11289600, 0 }, { TEGRA124_CLK_I2S0, TEGRA124_CLK_PLL_A_OUT0, 11289600, 0 }, { TEGRA124_CLK_I2S1, TEGRA124_CLK_PLL_A_OUT0, 11289600, 0 },
Signature · 1 line
2.24.1
Quoting Thierry Reding (2020-05-05 00:16:55)
Quoted 13 lines
From: Thierry Reding <[email protected]>
pll_a_out0and the I2S clocks are already configured to default to rates corresponding to a 44.1 kHz sampling rate, but thepll_aconfiguration was set to a default that is not listed in the frequency table, which caused the PLL code to compute an invalid configuration. As a result of this invalid configuration, Jetson TK1 fails to resume from suspend.This used to get papered over because the ASoC driver would force audio clocks to a 44.1 kHz configuration on boot. However, that's not really necessary and was hence removed in commit
ff5d18cb04f4("ASoC: tegra:
Enable audio mclk duringtegra_asoc_utils_init()").
Quoted 6 lines
Fix the initial rate for
pll_aso that it matches the 44.1 kHz entry in thepll_afrequency table.Fixes ff5d18cb04f4 ("ASoC: tegra: Enable audio mclk during tegra_asoc_utils_init()")Signed-off-by Thierry Reding <[email protected]>---
Applied to clk-fixes