leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clk: highbank: Convert to CLK_IS_CRITICAL

Browse Source 
This code is hand-rolling the CLK_IS_CRITICAL flag to keep a clk on once
it's registered. Just mark it as CLK_IS_CRITICAL instead so that the
framework can handle keeping the clk prepared and enabled for all
eternity.

Cc: Rob Herring <robh@kernel.org>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
This commit is contained in:
Stephen Boyd 2019-03-06 14:13:41 -08:00
parent 1c163f4c7b
commit 043f44aba9
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/clk/clk-highbank.c
View File

@ -17,7 +17,6 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/clk.h>
#include <linux/clk-provider.h> #include <linux/clk-provider.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/of.h> #include <linux/of.h>
@ -272,7 +271,7 @@ static const struct clk_ops periclk_ops = {
.set_rate = clk_periclk_set_rate, .set_rate = clk_periclk_set_rate,
}; };
static __init struct clk *hb_clk_init(struct device_node *node, const struct clk_ops *ops) static void __init hb_clk_init(struct device_node *node, const struct clk_ops *ops, unsigned long clkflags)
{ {
u32 reg; u32 reg;
struct hb_clk *hb_clk; struct hb_clk *hb_clk;
@ -284,11 +283,11 @@ static __init struct clk *hb_clk_init(struct device_node *node, const struct clk
rc = of_property_read_u32(node, "reg", &reg); rc = of_property_read_u32(node, "reg", &reg);
if (WARN_ON(rc)) if (WARN_ON(rc))
return NULL; return;
hb_clk = kzalloc(sizeof(*hb_clk), GFP_KERNEL); hb_clk = kzalloc(sizeof(*hb_clk), GFP_KERNEL);
if (WARN_ON(!hb_clk)) if (WARN_ON(!hb_clk))
return NULL; return;
/* Map system registers */ /* Map system registers */
srnp = of_find_compatible_node(NULL, NULL, "calxeda,hb-sregs"); srnp = of_find_compatible_node(NULL, NULL, "calxeda,hb-sregs");
@ -300,7 +299,7 @@ static __init struct clk *hb_clk_init(struct device_node *node, const struct clk
init.name = clk_name; init.name = clk_name;
init.ops = ops; init.ops = ops;
init.flags = 0; init.flags = clkflags;
parent_name = of_clk_get_parent_name(node, 0); parent_name = of_clk_get_parent_name(node, 0);
init.parent_names = &parent_name; init.parent_names = &parent_name;
init.num_parents = 1; init.num_parents = 1;
@ -310,33 +309,31 @@ static __init struct clk *hb_clk_init(struct device_node *node, const struct clk
rc = clk_hw_register(NULL, &hb_clk->hw); rc = clk_hw_register(NULL, &hb_clk->hw);
if (WARN_ON(rc)) { if (WARN_ON(rc)) {
kfree(hb_clk); kfree(hb_clk);
return NULL; return;
} }
rc = of_clk_add_hw_provider(node, of_clk_hw_simple_get, &hb_clk->hw); of_clk_add_hw_provider(node, of_clk_hw_simple_get, &hb_clk->hw);
return hb_clk->hw.clk;
} }
static void __init hb_pll_init(struct device_node *node) static void __init hb_pll_init(struct device_node *node)
{ {
hb_clk_init(node, &clk_pll_ops); hb_clk_init(node, &clk_pll_ops, 0);
} }
CLK_OF_DECLARE(hb_pll, "calxeda,hb-pll-clock", hb_pll_init); CLK_OF_DECLARE(hb_pll, "calxeda,hb-pll-clock", hb_pll_init);
static void __init hb_a9periph_init(struct device_node *node) static void __init hb_a9periph_init(struct device_node *node)
{ {
hb_clk_init(node, &a9periphclk_ops); hb_clk_init(node, &a9periphclk_ops, 0);
} }
CLK_OF_DECLARE(hb_a9periph, "calxeda,hb-a9periph-clock", hb_a9periph_init); CLK_OF_DECLARE(hb_a9periph, "calxeda,hb-a9periph-clock", hb_a9periph_init);
static void __init hb_a9bus_init(struct device_node *node) static void __init hb_a9bus_init(struct device_node *node)
{ {
struct clk *clk = hb_clk_init(node, &a9bclk_ops); hb_clk_init(node, &a9bclk_ops, CLK_IS_CRITICAL);
clk_prepare_enable(clk);
} }
CLK_OF_DECLARE(hb_a9bus, "calxeda,hb-a9bus-clock", hb_a9bus_init); CLK_OF_DECLARE(hb_a9bus, "calxeda,hb-a9bus-clock", hb_a9bus_init);
static void __init hb_emmc_init(struct device_node *node) static void __init hb_emmc_init(struct device_node *node)
{ {
hb_clk_init(node, &periclk_ops); hb_clk_init(node, &periclk_ops, 0);
} }
CLK_OF_DECLARE(hb_emmc, "calxeda,hb-emmc-clock", hb_emmc_init); CLK_OF_DECLARE(hb_emmc, "calxeda,hb-emmc-clock", hb_emmc_init);