Core clock API code should not change parent clocks set initially by the boot-loader. This patch removes implicit sclk_audio0 clock change introduced in commit "ARM: EXYNOS4: Add PCM audio support for WM8994" (09c60e8). If SMDK board needs such change it should be done in respective board startup code or preferably in the boot-loader. This patch fixes problems with suspend/resume on Samsung NURI board. Signed-off-by: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx> --- arch/arm/mach-exynos4/clock.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-exynos4/clock.c b/arch/arm/mach-exynos4/clock.c index 5091e13..6146c6e 100644 --- a/arch/arm/mach-exynos4/clock.c +++ b/arch/arm/mach-exynos4/clock.c @@ -1287,7 +1287,6 @@ void __init_or_cpufreq exynos4_setup_clocks(void) s3c_set_clksrc(&clksrcs[ptr], true); clk_audiocdclk0.rate = PCM_EXTCLK0; - clk_set_parent(&clk_sclk_audio0.clk, &clk_audiocdclk0); } static struct clk *clks[] __initdata = { -- 1.7.1.569.g6f426 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html