mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-02-15 04:42:02 +00:00
43 lines
1.5 KiB
Diff
43 lines
1.5 KiB
Diff
From 350a3b16e89ad8297a5bbf663d1912a237377375 Mon Sep 17 00:00:00 2001
|
|
From: Eric Anholt <eric@anholt.net>
|
|
Date: Mon, 9 May 2016 17:28:18 -0700
|
|
Subject: [PATCH 026/432] clk: bcm2835: Mark GPIO clocks enabled at boot as
|
|
critical.
|
|
|
|
These divide off of PLLD_PER and are used for the ethernet and wifi
|
|
PHYs source PLLs. Neither of them is currently represented by a phy
|
|
device that would grab the clock for us.
|
|
|
|
This keeps other drivers from killing the networking PHYs when they
|
|
disable their own clocks and trigger PLLD_PER's refcount going to 0.
|
|
|
|
v2: Skip marking as critical if they aren't on at boot.
|
|
|
|
Signed-off-by: Eric Anholt <eric@anholt.net>
|
|
---
|
|
drivers/clk/bcm/clk-bcm2835.c | 9 +++++++++
|
|
1 file changed, 9 insertions(+)
|
|
|
|
diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c
|
|
index 12dd417457ac..a142253afdff 100644
|
|
--- a/drivers/clk/bcm/clk-bcm2835.c
|
|
+++ b/drivers/clk/bcm/clk-bcm2835.c
|
|
@@ -1453,6 +1453,15 @@ static struct clk_hw *bcm2835_register_clock(struct bcm2835_cprman *cprman,
|
|
init.name = data->name;
|
|
init.flags = data->flags | CLK_IGNORE_UNUSED;
|
|
|
|
+ /*
|
|
+ * Some GPIO clocks for ethernet/wifi PLLs are marked as
|
|
+ * critical (since some platforms use them), but if the
|
|
+ * firmware didn't have them turned on then they clearly
|
|
+ * aren't actually critical.
|
|
+ */
|
|
+ if ((cprman_read(cprman, data->ctl_reg) & CM_ENABLE) == 0)
|
|
+ init.flags &= ~CLK_IS_CRITICAL;
|
|
+
|
|
/*
|
|
* Pass the CLK_SET_RATE_PARENT flag if we are allowed to propagate
|
|
* rate changes on at least of the parents.
|
|
--
|
|
2.19.1
|
|
|