m68k: coldfire/clk.c: move m5441x specific code

Moving specific m5441x clk-related code in more appropriate location,
since breaking compilation for other targets.

Signed-off-by: Angelo Dureghello <angelo.dureghello@timesys.com>
Link: https://lore.kernel.org/r/20200525102324.2723438-1-angelo.dureghello@timesys.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/arch/m68k/coldfire/clk.c b/arch/m68k/coldfire/clk.c
index 75a0574..7bc666e 100644 (file)
--- a/arch/m68k/coldfire/clk.c
+++ b/arch/m68k/coldfire/clk.c
@@ -73,21 +73,6 @@ struct clk_ops clk_ops1 = {
 #endif /* MCFPM_PPMCR1 */
 #endif /* MCFPM_PPMCR0 */
 
-static void __clk_enable2(struct clk *clk)
-{
-       __raw_writel(__raw_readl(MCFSDHC_CLK) | (1 << clk->slot), MCFSDHC_CLK);
-}
-
-static void __clk_disable2(struct clk *clk)
-{
-       __raw_writel(__raw_readl(MCFSDHC_CLK) & ~(1 << clk->slot), MCFSDHC_CLK);
-}
-
-struct clk_ops clk_ops2 = {
-       .enable         = __clk_enable2,
-       .disable        = __clk_disable2,
-};
-
 struct clk *clk_get(struct device *dev, const char *id)
 {
        const char *clk_name = dev ? dev_name(dev) : id ? id : NULL;

diff --git a/arch/m68k/coldfire/m5441x.c b/arch/m68k/coldfire/m5441x.c
index ffa02de..1e5259a 100644 (file)
--- a/arch/m68k/coldfire/m5441x.c
+++ b/arch/m68k/coldfire/m5441x.c
@@ -204,6 +204,21 @@ static struct clk * const disable_clks[] __initconst = {
        &__clk_1_29, /* uart 9 */
 };
 
+static void __clk_enable2(struct clk *clk)
+{
+       __raw_writel(__raw_readl(MCFSDHC_CLK) | (1 << clk->slot), MCFSDHC_CLK);
+}
+
+static void __clk_disable2(struct clk *clk)
+{
+       __raw_writel(__raw_readl(MCFSDHC_CLK) & ~(1 << clk->slot), MCFSDHC_CLK);
+}
+
+struct clk_ops clk_ops2 = {
+       .enable         = __clk_enable2,
+       .disable        = __clk_disable2,
+};
+
 static void __init m5441x_clk_init(void)
 {
        unsigned i;