Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e69fdcca authored by Eric Anholt's avatar Eric Anholt Committed by Stephen Boyd
Browse files

clk: bcm2835: Mark the VPU clock as critical 



The VPU clock is also the clock for our AXI bus, so we really can't
disable it.  This might have happened during boot if, for example,
uart1 (aux_uart clock) probed and was then disabled before the other
consumers of the VPU clock had probed.

Signed-off-by: default avatarEric Anholt <eric@anholt.net>
Acked-by: default avatarMartin Sperl <kernel@martin.sperl.org>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
parent 9bb87c02

drivers/clk/bcm/clk-bcm2835.c

+4 −1
Original line number Diff line number Diff line
@@ -443,6 +443,8 @@ struct bcm2835_clock_data { 
	/* Number of fractional bits in the divider */

	u32 frac_bits;



	u32 flags;



	bool is_vpu_clock;

	bool is_mash_clock;

};
@@ -1230,7 +1232,7 @@ static struct clk *bcm2835_register_clock(struct bcm2835_cprman *cprman, 
	init.parent_names = parents;

	init.num_parents = data->num_mux_parents;

	init.name = data->name;

	init.flags = CLK_IGNORE_UNUSED;

	init.flags = data->flags | CLK_IGNORE_UNUSED;



	if (data->is_vpu_clock) {

		init.ops = &bcm2835_vpu_clock_clk_ops;
@@ -1649,6 +1651,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { 
		.div_reg = CM_VPUDIV,

		.int_bits = 12,

		.frac_bits = 8,

		.flags = CLK_IS_CRITICAL,

		.is_vpu_clock = true),



	/* clocks with per parent mux */