From: Ricardo Ribalda Delgado Date: Tue, 5 Jul 2016 16:23:32 +0000 (+0200) Subject: clk: core: Avoid double initialization of clocks X-Git-Tag: v4.9-rc1~142^2~139 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=989eafd0b609;p=karo-tx-linux.git clk: core: Avoid double initialization of clocks Some clock providers can be initialized via of_clk_init() and also via platform device probe. Avoid double initialization of them by setting the OF_POPULATED flag. Signed-off-by: Ricardo Ribalda Delgado Signed-off-by: Stephen Boyd --- diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index 238b989bf778..0c6009a19957 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -3459,6 +3459,10 @@ void __init of_clk_init(const struct of_device_id *matches) &clk_provider_list, node) { if (force || parent_ready(clk_provider->np)) { + /* Don't populate platform devices */ + of_node_set_flag(clk_provider->np, + OF_POPULATED); + clk_provider->clk_init_cb(clk_provider->np); of_clk_set_defaults(clk_provider->np, true);