Skip to content

Commit 6bf48c4

Browse files
committed
rp1: clk: Remove CLK_IGNORE_UNUSED flags
There should be no issue in disabling the RP1 clocks as long as the kernel knows about all consumers. Signed-off-by: Dave Stevenson <[email protected]>
1 parent f6b7f74 commit 6bf48c4

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

drivers/clk/clk-rp1.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1551,7 +1551,7 @@ static struct clk_hw *rp1_register_pll(struct rp1_clockman *clockman,
15511551
init.num_parents = 1;
15521552
init.name = pll_data->name;
15531553
init.ops = &rp1_pll_ops;
1554-
init.flags = pll_data->flags | CLK_IGNORE_UNUSED;
1554+
init.flags = pll_data->flags;
15551555

15561556
pll = kzalloc(sizeof(*pll), GFP_KERNEL);
15571557
if (!pll)
@@ -1585,7 +1585,7 @@ static struct clk_hw *rp1_register_pll_ph(struct rp1_clockman *clockman,
15851585
init.num_parents = 1;
15861586
init.name = ph_data->name;
15871587
init.ops = &rp1_pll_ph_ops;
1588-
init.flags = ph_data->flags | CLK_IGNORE_UNUSED;
1588+
init.flags = ph_data->flags;
15891589

15901590
ph = kzalloc(sizeof(*ph), GFP_KERNEL);
15911591
if (!ph)
@@ -1618,7 +1618,7 @@ static struct clk_hw *rp1_register_pll_divider(struct rp1_clockman *clockman,
16181618
init.num_parents = 1;
16191619
init.name = divider_data->name;
16201620
init.ops = &rp1_pll_divider_ops;
1621-
init.flags = divider_data->flags | CLK_IGNORE_UNUSED;
1621+
init.flags = divider_data->flags;
16221622

16231623
divider = devm_kzalloc(clockman->dev, sizeof(*divider), GFP_KERNEL);
16241624
if (!divider)
@@ -1661,7 +1661,7 @@ static struct clk_hw *rp1_register_clock(struct rp1_clockman *clockman,
16611661
init.num_parents =
16621662
clock_data->num_std_parents + clock_data->num_aux_parents;
16631663
init.name = clock_data->name;
1664-
init.flags = clock_data->flags | CLK_IGNORE_UNUSED;
1664+
init.flags = clock_data->flags;
16651665
init.ops = &rp1_clk_ops;
16661666

16671667
clock = devm_kzalloc(clockman->dev, sizeof(*clock), GFP_KERNEL);
@@ -1691,7 +1691,6 @@ static struct clk_hw *rp1_register_varsrc(struct rp1_clockman *clockman,
16911691
init.parent_names = &ref_clock;
16921692
init.num_parents = 1;
16931693
init.name = name;
1694-
init.flags = CLK_IGNORE_UNUSED;
16951694
init.ops = &rp1_varsrc_ops;
16961695

16971696
clock = devm_kzalloc(clockman->dev, sizeof(*clock), GFP_KERNEL);

0 commit comments

Comments
 (0)