Skip to content

Commit b2683d0

Browse files
mripardbebarino
authored andcommitted
clk: bcm2835: Allow custom CCF flags for the PLLs
While some clock types allow for each clock to specify its own custom flags, the PLLs can't. We will need this for the PLLB, so let's add it. Acked-by: Nicolas Saenz Julienne <[email protected]> Tested-by: Nicolas Saenz Julienne <[email protected]> Signed-off-by: Maxime Ripard <[email protected]> Link: https://lore.kernel.org/r/ae8bd505d8851f6646e244cd76b6b289346973c8.1592210452.git-series.maxime@cerno.tech Signed-off-by: Stephen Boyd <[email protected]>
1 parent dbe01b4 commit b2683d0

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/clk/bcm/clk-bcm2835.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -421,6 +421,7 @@ struct bcm2835_pll_data {
421421
u32 reference_enable_mask;
422422
/* Bit in CM_LOCK to indicate when the PLL has locked. */
423423
u32 lock_mask;
424+
u32 flags;
424425

425426
const struct bcm2835_pll_ana_bits *ana;
426427

@@ -1310,7 +1311,7 @@ static struct clk_hw *bcm2835_register_pll(struct bcm2835_cprman *cprman,
13101311
init.num_parents = 1;
13111312
init.name = pll_data->name;
13121313
init.ops = &bcm2835_pll_clk_ops;
1313-
init.flags = CLK_IGNORE_UNUSED;
1314+
init.flags = pll_data->flags | CLK_IGNORE_UNUSED;
13141315

13151316
pll = kzalloc(sizeof(*pll), GFP_KERNEL);
13161317
if (!pll)

0 commit comments

Comments
 (0)