Commit 63aadb77 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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: default avatarGreg Ungerer <gerg@linux-m68k.org>
Tested-by: default avatarGreg Ungerer <gerg@linux-m68k.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 35f752be

arch/m68k/Kconfig.cpu

+4 −0
Original line number Diff line number Diff line
@@ -328,6 +328,10 @@ config COLDFIRE_SLTIMERS 
	bool

	select LEGACY_TIMER_TICK



config COLDFIRE_CLKDEV_LOOKUP

	def_bool !(M5206 || M5206e || M53xx || M5441x)

	select CLKDEV_LOOKUP



endif # COLDFIRE

arch/m68k/coldfire/clk.c

+8 −8
Original line number Diff line number Diff line
@@ -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)

arch/m68k/coldfire/m5206.c

+11 −14
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 


/***************************************************************************/



#include <linux/clkdev.h>

#include <linux/kernel.h>

#include <linux/param.h>

#include <linux/init.h>
@@ -23,21 +24,15 @@ 


DEFINE_CLK(pll, "pll.0", MCF_CLK);

DEFINE_CLK(sys, "sys.0", MCF_BUSCLK);

DEFINE_CLK(mcftmr0, "mcftmr.0", MCF_BUSCLK);

DEFINE_CLK(mcftmr1, "mcftmr.1", MCF_BUSCLK);

DEFINE_CLK(mcfuart0, "mcfuart.0", MCF_BUSCLK);

DEFINE_CLK(mcfuart1, "mcfuart.1", MCF_BUSCLK);

DEFINE_CLK(mcfi2c0, "imx1-i2c.0", MCF_BUSCLK);



struct clk *mcf_clks[] = {

	&clk_pll,

	&clk_sys,

	&clk_mcftmr0,

	&clk_mcftmr1,

	&clk_mcfuart0,

	&clk_mcfuart1,

	&clk_mcfi2c0,

	NULL

static struct clk_lookup m5206_clk_lookup[] = {

	CLKDEV_INIT(NULL, "pll.0", &clk_pll),

	CLKDEV_INIT(NULL, "sys.0", &clk_sys),

	CLKDEV_INIT("mcftmr.0", NULL, &clk_sys),

	CLKDEV_INIT("mcftmr.1", NULL, &clk_sys),

	CLKDEV_INIT("mcfuart.0", NULL, &clk_sys),

	CLKDEV_INIT("mcfuart.1", NULL, &clk_sys),

	CLKDEV_INIT("imx1-i2c.0", NULL, &clk_sys),

};



/***************************************************************************/
@@ -66,6 +61,8 @@ void __init config_BSP(char *commandp, int size) 
	mcf_mapirq2imr(28, MCFINTC_EINT4);

	mcf_mapirq2imr(31, MCFINTC_EINT7);

	m5206_i2c_init();



	clkdev_add_table(m5206_clk_lookup, ARRAY_SIZE(m5206_clk_lookup));

}



/***************************************************************************/

arch/m68k/coldfire/m523x.c

+17 −25
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 


/***************************************************************************/



#include <linux/clkdev.h>

#include <linux/kernel.h>

#include <linux/param.h>

#include <linux/init.h>
@@ -26,31 +27,20 @@ 


DEFINE_CLK(pll, "pll.0", MCF_CLK);

DEFINE_CLK(sys, "sys.0", MCF_BUSCLK);

DEFINE_CLK(mcfpit0, "mcfpit.0", MCF_CLK);

DEFINE_CLK(mcfpit1, "mcfpit.1", MCF_CLK);

DEFINE_CLK(mcfpit2, "mcfpit.2", MCF_CLK);

DEFINE_CLK(mcfpit3, "mcfpit.3", MCF_CLK);

DEFINE_CLK(mcfuart0, "mcfuart.0", MCF_BUSCLK);

DEFINE_CLK(mcfuart1, "mcfuart.1", MCF_BUSCLK);

DEFINE_CLK(mcfuart2, "mcfuart.2", MCF_BUSCLK);

DEFINE_CLK(mcfqspi0, "mcfqspi.0", MCF_BUSCLK);

DEFINE_CLK(fec0, "fec.0", MCF_BUSCLK);

DEFINE_CLK(mcfi2c0, "imx1-i2c.0", MCF_BUSCLK);



struct clk *mcf_clks[] = {

	&clk_pll,

	&clk_sys,

	&clk_mcfpit0,

	&clk_mcfpit1,

	&clk_mcfpit2,

	&clk_mcfpit3,

	&clk_mcfuart0,

	&clk_mcfuart1,

	&clk_mcfuart2,

	&clk_mcfqspi0,

	&clk_fec0,

	&clk_mcfi2c0,

	NULL



struct clk_lookup m523x_clk_lookup[] = {

	CLKDEV_INIT(NULL, "pll.0", &clk_pll),

	CLKDEV_INIT(NULL, "sys.0", &clk_sys),

	CLKDEV_INIT("mcfpit.0", NULL, &clk_pll),

	CLKDEV_INIT("mcfpit.1", NULL, &clk_pll),

	CLKDEV_INIT("mcfpit.2", NULL, &clk_pll),

	CLKDEV_INIT("mcfpit.3", NULL, &clk_pll),

	CLKDEV_INIT("mcfuart.0", NULL, &clk_sys),

	CLKDEV_INIT("mcfuart.1", NULL, &clk_sys),

	CLKDEV_INIT("mcfuart.2", NULL, &clk_sys),

	CLKDEV_INIT("mcfqspi.0", NULL, &clk_sys),

	CLKDEV_INIT("fec.0", NULL, &clk_sys),

	CLKDEV_INIT("imx1-i2c.0", NULL, &clk_sys),

};



/***************************************************************************/
@@ -100,6 +90,8 @@ void __init config_BSP(char *commandp, int size) 
	m523x_fec_init();

	m523x_qspi_init();

	m523x_i2c_init();



	clkdev_add_table(m523x_clk_lookup, ARRAY_SIZE(m523x_clk_lookup));

}



/***************************************************************************/

arch/m68k/coldfire/m5249.c

+14 −19
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 


/***************************************************************************/



#include <linux/clkdev.h>

#include <linux/kernel.h>

#include <linux/param.h>

#include <linux/init.h>
@@ -23,25 +24,17 @@ 


DEFINE_CLK(pll, "pll.0", MCF_CLK);

DEFINE_CLK(sys, "sys.0", MCF_BUSCLK);

DEFINE_CLK(mcftmr0, "mcftmr.0", MCF_BUSCLK);

DEFINE_CLK(mcftmr1, "mcftmr.1", MCF_BUSCLK);

DEFINE_CLK(mcfuart0, "mcfuart.0", MCF_BUSCLK);

DEFINE_CLK(mcfuart1, "mcfuart.1", MCF_BUSCLK);

DEFINE_CLK(mcfqspi0, "mcfqspi.0", MCF_BUSCLK);

DEFINE_CLK(mcfi2c0, "imx1-i2c.0", MCF_BUSCLK);

DEFINE_CLK(mcfi2c1, "imx1-i2c.1", MCF_BUSCLK);



struct clk *mcf_clks[] = {

	&clk_pll,

	&clk_sys,

	&clk_mcftmr0,

	&clk_mcftmr1,

	&clk_mcfuart0,

	&clk_mcfuart1,

	&clk_mcfqspi0,

	&clk_mcfi2c0,

	&clk_mcfi2c1,

	NULL



struct clk_lookup m5249_clk_lookup[] = {

	CLKDEV_INIT(NULL, "pll.0", &clk_pll),

	CLKDEV_INIT(NULL, "sys.0", &clk_sys),

	CLKDEV_INIT("mcftmr.0", NULL, &clk_sys),

	CLKDEV_INIT("mcftmr.1", NULL, &clk_sys),

	CLKDEV_INIT("mcfuart.0", NULL, &clk_sys),

	CLKDEV_INIT("mcfuart.1", NULL, &clk_sys),

	CLKDEV_INIT("mcfqspi.0", NULL, &clk_sys),

	CLKDEV_INIT("imx1-i2c.0", NULL, &clk_sys),

	CLKDEV_INIT("imx1-i2c.1", NULL, &clk_sys),

};



/***************************************************************************/
@@ -137,6 +130,8 @@ void __init config_BSP(char *commandp, int size) 
#endif

	m5249_qspi_init();

	m5249_i2c_init();



	clkdev_add_table(m5249_clk_lookup, ARRAY_SIZE(m5249_clk_lookup));

}



/***************************************************************************/