56 lines
1.6 KiB
Diff
56 lines
1.6 KiB
Diff
|
From 3350516c28c5c47c481168b1667a7f690acb1724 Mon Sep 17 00:00:00 2001
|
||
|
From: Samuel Holland <samuel@sholland.org>
|
||
|
Date: Mon, 30 Dec 2019 12:39:31 -0600
|
||
|
Subject: [PATCH 158/464] Revert "clk: qcom: Support 'protected-clocks'
|
||
|
property"
|
||
|
|
||
|
Now that protected-clocks is handled in the clk core, this
|
||
|
driver-specific implementation is redundant.
|
||
|
|
||
|
This reverts commit b181b3b801da8893c8eb706e448dd5111b02de60.
|
||
|
|
||
|
Signed-off-by: Samuel Holland <samuel@sholland.org>
|
||
|
---
|
||
|
drivers/clk/qcom/common.c | 18 ------------------
|
||
|
1 file changed, 18 deletions(-)
|
||
|
|
||
|
diff --git a/drivers/clk/qcom/common.c b/drivers/clk/qcom/common.c
|
||
|
index 75f09e6e057e..8e94e425eb2f 100644
|
||
|
--- a/drivers/clk/qcom/common.c
|
||
|
+++ b/drivers/clk/qcom/common.c
|
||
|
@@ -204,22 +204,6 @@ int qcom_cc_register_sleep_clk(struct device *dev)
|
||
|
}
|
||
|
EXPORT_SYMBOL_GPL(qcom_cc_register_sleep_clk);
|
||
|
|
||
|
-/* Drop 'protected-clocks' from the list of clocks to register */
|
||
|
-static void qcom_cc_drop_protected(struct device *dev, struct qcom_cc *cc)
|
||
|
-{
|
||
|
- struct device_node *np = dev->of_node;
|
||
|
- struct property *prop;
|
||
|
- const __be32 *p;
|
||
|
- u32 i;
|
||
|
-
|
||
|
- of_property_for_each_u32(np, "protected-clocks", prop, p, i) {
|
||
|
- if (i >= cc->num_rclks)
|
||
|
- continue;
|
||
|
-
|
||
|
- cc->rclks[i] = NULL;
|
||
|
- }
|
||
|
-}
|
||
|
-
|
||
|
static struct clk_hw *qcom_cc_clk_hw_get(struct of_phandle_args *clkspec,
|
||
|
void *data)
|
||
|
{
|
||
|
@@ -282,8 +266,6 @@ int qcom_cc_really_probe(struct platform_device *pdev,
|
||
|
cc->rclks = rclks;
|
||
|
cc->num_rclks = num_clks;
|
||
|
|
||
|
- qcom_cc_drop_protected(dev, cc);
|
||
|
-
|
||
|
for (i = 0; i < num_clk_hws; i++) {
|
||
|
ret = devm_clk_hw_register(dev, clk_hws[i]);
|
||
|
if (ret)
|
||
|
--
|
||
|
2.34.1
|
||
|
|