Merge tag 'sunxi-clk-fixes-for-4.13' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into clk-fixes

bebarino · bebarino · commit 5c0858f12bbd · 2017-08-02T09:11:44.000-07:00
Pull one Allwinner clock fix from Chen-Yu Tsai: One critical clock fix for sun5i (A10s/A13/R8) which enables propagation of clock rate changes from the "cpu" clock to it's parent PLL clock. This fixes cpufreq related crashes that have been observed on KernelCI with the C.H.I.P. and multi_v7_defconfig. * tag 'sunxi-clk-fixes-for-4.13' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: clk: sunxi-ng: sun5i: Add clk_set_rate_parent to the CPU clock
diff --git a/drivers/clk/sunxi-ng/ccu-sun5i.c b/drivers/clk/sunxi-ng/ccu-sun5i.c
@@ -184,7 +184,7 @@ static struct ccu_mux cpu_clk = {
 		.hw.init	= CLK_HW_INIT_PARENTS("cpu",
 						      cpu_parents,
 						      &ccu_mux_ops,
-						      CLK_IS_CRITICAL),
+						      CLK_SET_RATE_PARENT | CLK_IS_CRITICAL),
 	}
 };
 

Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ static struct ccu_mux cpu_clk = {`
`184`	`184`	`.hw.init = CLK_HW_INIT_PARENTS("cpu",`
`185`	`185`	`cpu_parents,`
`186`	`186`	`&ccu_mux_ops,`
`187`		`- CLK_IS_CRITICAL),`
	`187`	`+ CLK_SET_RATE_PARENT \| CLK_IS_CRITICAL),`
`188`	`188`	`}`
`189`	`189`	`};`
`190`	`190`