| Message ID | 20200525102324.2723438-1-angelo.dureghello@timesys.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [for-next] m68k: coldfire/clk.c: move m5441x specific code | expand |
On Mon, 25 May 2020 at 12:17, Angelo Dureghello <angelo.dureghello@timesys.com> wrote: > > 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> Applied for next, to get this tested asap, thanks! Kind regards Uffe > --- > arch/m68k/coldfire/clk.c | 15 --------------- > arch/m68k/coldfire/m5441x.c | 15 +++++++++++++++ > 2 files changed, 15 insertions(+), 15 deletions(-) > > diff --git a/arch/m68k/coldfire/clk.c b/arch/m68k/coldfire/clk.c > index 75a057445472..7bc666e482eb 100644 > --- 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 ffa02de1a3fb..1e5259a652d1 100644 > --- 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; > -- > 2.26.2 >
diff --git a/arch/m68k/coldfire/clk.c b/arch/m68k/coldfire/clk.c index 75a057445472..7bc666e482eb 100644 --- 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 ffa02de1a3fb..1e5259a652d1 100644 --- 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;
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> --- arch/m68k/coldfire/clk.c | 15 --------------- arch/m68k/coldfire/m5441x.c | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 15 deletions(-)