aboutsummaryrefslogtreecommitdiff
path: root/drivers/clk/berlin/berlin2-div.c
diff options
context:
space:
mode:
authorGravatar Stephen Boyd <stephen.boyd@linaro.org> 2016-08-16 15:40:52 -0700
committerGravatar Stephen Boyd <sboyd@codeaurora.org> 2016-08-18 11:30:01 -0700
commitf6475e29829775fb2d28add14246f755b44cd68d (patch)
tree530a26557361a600d2fba38d714c769b0ccf2e10 /drivers/clk/berlin/berlin2-div.c
parentclk: gcc-ipq4019: Delete unnecessary assignment for the field "owner" (diff)
downloadlinux-f6475e29829775fb2d28add14246f755b44cd68d.tar.gz
linux-f6475e29829775fb2d28add14246f755b44cd68d.tar.bz2
linux-f6475e29829775fb2d28add14246f755b44cd68d.zip
clk: berlin: Migrate to clk_hw based registration and OF APIs
Now that we have clk_hw based provider APIs to register clks, we can get rid of struct clk pointers while registering clks in these drivers, allowing us to move closer to a clear split of consumer and provider clk APIs. We also remove some __init markings in header files as they're useless and we're in the area. Tested-by: Jisheng Zhang <jszhang@marvell.com> Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com> Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Signed-off-by: Stephen Boyd <stephen.boyd@linaro.org> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Diffstat (limited to 'drivers/clk/berlin/berlin2-div.c')
-rw-r--r--drivers/clk/berlin/berlin2-div.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/berlin/berlin2-div.c b/drivers/clk/berlin/berlin2-div.c
index 81ff97f8aa0b..41ab2d392c57 100644
--- a/drivers/clk/berlin/berlin2-div.c
+++ b/drivers/clk/berlin/berlin2-div.c
@@ -234,7 +234,7 @@ static const struct clk_ops berlin2_div_mux_ops = {
.get_parent = berlin2_div_get_parent,
};
-struct clk * __init
+struct clk_hw * __init
berlin2_div_register(const struct berlin2_div_map *map,
void __iomem *base, const char *name, u8 div_flags,
const char **parent_names, int num_parents,
@@ -259,7 +259,7 @@ berlin2_div_register(const struct berlin2_div_map *map,
if ((div_flags & BERLIN2_DIV_HAS_MUX) == 0)
mux_ops = NULL;
- return clk_register_composite(NULL, name, parent_names, num_parents,
+ return clk_hw_register_composite(NULL, name, parent_names, num_parents,
&div->hw, mux_ops, &div->hw, rate_ops,
&div->hw, gate_ops, flags);
}