5.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Peter Griffin <peter.griffin@xxxxxxxxxx> commit f1edb498bd9f25936ae3540a8dbd86e6019fdb95 upstream. As now we also need to probe in the reset driver as well. Cc: Michael Turquette <mturquette@xxxxxxxxxxxx> Cc: Stephen Boyd <sboyd@xxxxxxxxxx> Cc: Allison Randal <allison@xxxxxxxxxxx> Cc: Peter Griffin <peter.griffin@xxxxxxxxxx> Cc: linux-clk@xxxxxxxxxxxxxxx Signed-off-by: Peter Griffin <peter.griffin@xxxxxxxxxx> Signed-off-by: John Stultz <john.stultz@xxxxxxxxxx> Link: https://lkml.kernel.org/r/20191001182546.70090-1-john.stultz@xxxxxxxxxx [sboyd@xxxxxxxxxx: Add comment about reset driver] Signed-off-by: Stephen Boyd <sboyd@xxxxxxxxxx> Cc: Yongqin Liu <yongqin.liu@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/clk/hisilicon/clk-hi6220.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/clk/hisilicon/clk-hi6220.c +++ b/drivers/clk/hisilicon/clk-hi6220.c @@ -86,7 +86,8 @@ static void __init hi6220_clk_ao_init(st hisi_clk_register_gate_sep(hi6220_separated_gate_clks_ao, ARRAY_SIZE(hi6220_separated_gate_clks_ao), clk_data_ao); } -CLK_OF_DECLARE(hi6220_clk_ao, "hisilicon,hi6220-aoctrl", hi6220_clk_ao_init); +/* Allow reset driver to probe as well */ +CLK_OF_DECLARE_DRIVER(hi6220_clk_ao, "hisilicon,hi6220-aoctrl", hi6220_clk_ao_init); /* clocks in sysctrl */
