summaryrefslogtreecommitdiff
path: root/arch/m68k/coldfire/clk.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2021-05-31 12:12:55 +0300
committerArnd Bergmann <arnd@arndb.de>2021-06-08 18:00:09 +0300
commit63aadb77669a6856b26d73da85b4f788731524a3 (patch)
treeb34676b811907603d564f039a2ffc9070f65a710 /arch/m68k/coldfire/clk.c
parent35f752be4f412a1a58f4c15fa9282c53b956e067 (diff)
downloadlinux-63aadb77669a6856b26d73da85b4f788731524a3.tar.xz
m68k: coldfire: use clkdev_lookup on most coldfire
Coldfire is now the only target that implements the clk_get()/clk_put() helpers itself rather than using the common implementation. Most coldfire variants only have two distinct clocks and use the clk code purely for lookup. Change those over to use clkdev_lookup instead but leave the custom clk interface for those two clocks. Also leave the four SoCs that have gated clocks. Acked-by: Greg Ungerer <gerg@linux-m68k.org> Tested-by: Greg Ungerer <gerg@linux-m68k.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/m68k/coldfire/clk.c')
-rw-r--r--arch/m68k/coldfire/clk.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/m68k/coldfire/clk.c b/arch/m68k/coldfire/clk.c
index 076a9caa9557..ffe36627bab8 100644
--- a/arch/m68k/coldfire/clk.c
+++ b/arch/m68k/coldfire/clk.c
@@ -71,7 +71,6 @@ struct clk_ops clk_ops1 = {
.disable = __clk_disable1,
};
#endif /* MCFPM_PPMCR1 */
-#endif /* MCFPM_PPMCR0 */
struct clk *clk_get(struct device *dev, const char *id)
{
@@ -87,6 +86,14 @@ struct clk *clk_get(struct device *dev, const char *id)
}
EXPORT_SYMBOL(clk_get);
+void clk_put(struct clk *clk)
+{
+ if (clk->enabled != 0)
+ pr_warn("clk_put %s still enabled\n", clk->name);
+}
+EXPORT_SYMBOL(clk_put);
+#endif /* MCFPM_PPMCR0 */
+
int clk_enable(struct clk *clk)
{
unsigned long flags;
@@ -117,13 +124,6 @@ void clk_disable(struct clk *clk)
}
EXPORT_SYMBOL(clk_disable);
-void clk_put(struct clk *clk)
-{
- if (clk->enabled != 0)
- pr_warn("clk_put %s still enabled\n", clk->name);
-}
-EXPORT_SYMBOL(clk_put);
-
unsigned long clk_get_rate(struct clk *clk)
{
if (!clk)