Skip to content

Commit 9f4a2b2

Browse files
6by9pelwell
authored andcommitted
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 5a5b126 commit 9f4a2b2

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
@@ -1552,7 +1552,7 @@ static struct clk_hw *rp1_register_pll(struct rp1_clockman *clockman,
15521552
init.num_parents = 1;
15531553
init.name = pll_data->name;
15541554
init.ops = &rp1_pll_ops;
1555-
init.flags = pll_data->flags | CLK_IGNORE_UNUSED;
1555+
init.flags = pll_data->flags;
15561556

15571557
pll = kzalloc(sizeof(*pll), GFP_KERNEL);
15581558
if (!pll)
@@ -1586,7 +1586,7 @@ static struct clk_hw *rp1_register_pll_ph(struct rp1_clockman *clockman,
15861586
init.num_parents = 1;
15871587
init.name = ph_data->name;
15881588
init.ops = &rp1_pll_ph_ops;
1589-
init.flags = ph_data->flags | CLK_IGNORE_UNUSED;
1589+
init.flags = ph_data->flags;
15901590

15911591
ph = kzalloc(sizeof(*ph), GFP_KERNEL);
15921592
if (!ph)
@@ -1619,7 +1619,7 @@ static struct clk_hw *rp1_register_pll_divider(struct rp1_clockman *clockman,
16191619
init.num_parents = 1;
16201620
init.name = divider_data->name;
16211621
init.ops = &rp1_pll_divider_ops;
1622-
init.flags = divider_data->flags | CLK_IGNORE_UNUSED;
1622+
init.flags = divider_data->flags;
16231623

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

16681668
clock = devm_kzalloc(clockman->dev, sizeof(*clock), GFP_KERNEL);
@@ -1692,7 +1692,6 @@ static struct clk_hw *rp1_register_varsrc(struct rp1_clockman *clockman,
16921692
init.parent_names = &ref_clock;
16931693
init.num_parents = 1;
16941694
init.name = name;
1695-
init.flags = CLK_IGNORE_UNUSED;
16961695
init.ops = &rp1_varsrc_ops;
16971696

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

0 commit comments

Comments
 (0)