summaryrefslogtreecommitdiffstats
path: root/drivers/clk/st
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2016-06-07 12:19:25 +0100
committerStephen Boyd <sboyd@codeaurora.org>2016-06-30 12:17:06 -0700
commitfa6415affe2020606799fd4e9e89f37a01fb2ae9 (patch)
treead14cb3fda600e882729c41a2460f7ae57eba040 /drivers/clk/st
parent1a695a905c18548062509178b98bc91e67510864 (diff)
downloadlinux-stable-fa6415affe2020606799fd4e9e89f37a01fb2ae9.tar.gz
linux-stable-fa6415affe2020606799fd4e9e89f37a01fb2ae9.tar.bz2
linux-stable-fa6415affe2020606799fd4e9e89f37a01fb2ae9.zip
clk: st: clk-flexgen: Detect critical clocks
Utilise the new Critical Clock infrastructure to mark clocks which much not be disabled as CRITICAL. While we're at it, reduce the coverage of the flex_flags variable, since it's only really used in a single for() loop. Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Diffstat (limited to 'drivers/clk/st')
-rw-r--r--drivers/clk/st/clk-flexgen.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/clk/st/clk-flexgen.c b/drivers/clk/st/clk-flexgen.c
index 627267c7ec5c..546bd79c8e3a 100644
--- a/drivers/clk/st/clk-flexgen.c
+++ b/drivers/clk/st/clk-flexgen.c
@@ -267,7 +267,6 @@ static void __init st_of_flexgen_setup(struct device_node *np)
const char **parents;
int num_parents, i;
spinlock_t *rlock = NULL;
- unsigned long flex_flags = 0;
int ret;
pnode = of_get_parent(np);
@@ -308,12 +307,15 @@ static void __init st_of_flexgen_setup(struct device_node *np)
for (i = 0; i < clk_data->clk_num; i++) {
struct clk *clk;
const char *clk_name;
+ unsigned long flex_flags = 0;
if (of_property_read_string_index(np, "clock-output-names",
i, &clk_name)) {
break;
}
+ of_clk_detect_critical(np, i, &flex_flags);
+
/*
* If we read an empty clock name then the output is unused
*/