You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
75 lines
2.0 KiB
Diff
75 lines
2.0 KiB
Diff
From 8a3282a0a185108e37e7a48437b58d956ff56f4a Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Emilio=20L=C3=B3pez?= <emilio@elopez.com.ar>
|
|
Date: Mon, 23 Dec 2013 00:32:36 -0300
|
|
Subject: [PATCH] clk: sunxi: make factors_clk_setup return the clock it
|
|
registers
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
We will be needing this to register a factor clock as parent with leaf
|
|
divisors on a single call.
|
|
|
|
Signed-off-by: Emilio López <emilio@elopez.com.ar>
|
|
Acked-by: Mike Turquette <mturquette@linaro.org>
|
|
---
|
|
drivers/clk/sunxi/clk-sunxi.c | 15 ++++++++-------
|
|
1 file changed, 8 insertions(+), 7 deletions(-)
|
|
|
|
--- a/drivers/clk/sunxi/clk-sunxi.c
|
|
+++ b/drivers/clk/sunxi/clk-sunxi.c
|
|
@@ -317,8 +317,8 @@ static const struct factors_data sun4i_a
|
|
.getter = sun4i_get_apb1_factors,
|
|
};
|
|
|
|
-static void __init sunxi_factors_clk_setup(struct device_node *node,
|
|
- struct factors_data *data)
|
|
+static struct clk * __init sunxi_factors_clk_setup(struct device_node *node,
|
|
+ const struct factors_data *data)
|
|
{
|
|
struct clk *clk;
|
|
struct clk_factors *factors;
|
|
@@ -340,14 +340,14 @@ static void __init sunxi_factors_clk_set
|
|
|
|
factors = kzalloc(sizeof(struct clk_factors), GFP_KERNEL);
|
|
if (!factors)
|
|
- return;
|
|
+ return NULL;
|
|
|
|
/* Add a gate if this factor clock can be gated */
|
|
if (data->enable) {
|
|
gate = kzalloc(sizeof(struct clk_gate), GFP_KERNEL);
|
|
if (!gate) {
|
|
kfree(factors);
|
|
- return;
|
|
+ return NULL;
|
|
}
|
|
|
|
/* set up gate properties */
|
|
@@ -363,7 +363,7 @@ static void __init sunxi_factors_clk_set
|
|
if (!mux) {
|
|
kfree(factors);
|
|
kfree(gate);
|
|
- return;
|
|
+ return NULL;
|
|
}
|
|
|
|
/* set up gate properties */
|
|
@@ -384,13 +384,14 @@ static void __init sunxi_factors_clk_set
|
|
parents, i,
|
|
mux_hw, &clk_mux_ops,
|
|
&factors->hw, &clk_factors_ops,
|
|
- gate_hw, &clk_gate_ops,
|
|
- i ? 0 : CLK_IS_ROOT);
|
|
+ gate_hw, &clk_gate_ops, 0);
|
|
|
|
if (!IS_ERR(clk)) {
|
|
of_clk_add_provider(node, of_clk_src_simple_get, clk);
|
|
clk_register_clkdev(clk, clk_name, NULL);
|
|
}
|
|
+
|
|
+ return clk;
|
|
}
|
|
|
|
|