clk: Ignore disabled DT clock providers
authorGeert Uytterhoeven <geert+renesas@glider.be>
Fri, 26 Feb 2016 15:54:31 +0000 (16:54 +0100)
committerStephen Boyd <sboyd@codeaurora.org>
Fri, 26 Feb 2016 17:39:38 +0000 (09:39 -0800)
of_clk_init() uses for_each_matching_node_and_match() to find clock
providers, which returns all matching device nodes, whether they are
enabled or not. Hence clock providers that are disabled explicitly in DT
using e.g.

"status = "disabled";

are still activated.

Add a check to ignore device nodes that are not enabled, like
of_irq_init() does.

Reported-by: Ramesh Shanmugasundaram <ramesh.shanmugasundaram@bp.renesas.com>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
drivers/clk/clk.c

index 437eebf89fcf8d7ed31735ea697498e79dc6a993..b775c88ac36ded85bf41d6e6e2070929d4b8e325 100644 (file)
@@ -3138,6 +3138,9 @@ void __init of_clk_init(const struct of_device_id *matches)
        for_each_matching_node_and_match(np, matches, &match) {
                struct clock_provider *parent;
 
+               if (!of_device_is_available(np))
+                       continue;
+
                parent = kzalloc(sizeof(*parent), GFP_KERNEL);
                if (!parent) {
                        list_for_each_entry_safe(clk_provider, next,