1 From 0488240a92abe6fc9fa6f3a3058849b17af2d3e5 Mon Sep 17 00:00:00 2001
2 From: Eric Anholt <eric@anholt.net>
3 Date: Tue, 26 Apr 2016 11:44:59 -0700
4 Subject: [PATCH 349/381] clk: bcm2835: Mark the VPU clock as critical
6 The VPU clock is also the clock for our AXI bus, so we really can't
7 disable it. This might have happened during boot if, for example,
8 uart1 (aux_uart clock) probed and was then disabled before the other
9 consumers of the VPU clock had probed.
11 v2: Rewrite to use a .flags in bcm2835_clock_data, since other clocks
14 Signed-off-by: Eric Anholt <eric@anholt.net>
16 drivers/clk/bcm/clk-bcm2835.c | 5 ++++-
17 1 file changed, 4 insertions(+), 1 deletion(-)
19 --- a/drivers/clk/bcm/clk-bcm2835.c
20 +++ b/drivers/clk/bcm/clk-bcm2835.c
21 @@ -446,6 +446,8 @@ struct bcm2835_clock_data {
22 /* Number of fractional bits in the divider */
30 @@ -1246,7 +1248,7 @@ static struct clk *bcm2835_register_cloc
31 init.parent_names = parents;
32 init.num_parents = data->num_mux_parents;
33 init.name = data->name;
34 - init.flags = CLK_IGNORE_UNUSED;
35 + init.flags = data->flags | CLK_IGNORE_UNUSED;
37 if (data->is_vpu_clock) {
38 init.ops = &bcm2835_vpu_clock_clk_ops;
39 @@ -1665,6 +1667,7 @@ static const struct bcm2835_clk_desc clk
43 + .flags = CLK_IS_CRITICAL,
44 .is_vpu_clock = true),
46 /* clocks with per parent mux */