Commit 007f84ed authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

m68k: coldfire: remove private clk_get/clk_put 



Only three SoCs remain that use the custom clk_get/clk_put.
Move these over to clkdev_lookup tables as well. As before,
treat the "sys.0" and "pll.0" clocks as system-wide clocks,
and all the other ones as device specific.

The "name" field in 'struct clock' is now unused, so rename
that as well as a cleanup and to reduce the object code size.
The DEFINE_CLK macro could be changed the same way, but it
is less churn to just leave those in place, that can be
done as a follow-up later if someone is interested.

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 63aadb77

arch/m68k/Kconfig.cpu

+1 −4
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ config COLDFIRE 
	select CPU_HAS_NO_MULDIV64

	select GENERIC_CSUM

	select GPIOLIB

	select CLKDEV_LOOKUP

	select HAVE_LEGACY_CLK



endchoice
@@ -328,10 +329,6 @@ 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

+0 −21
Original line number Diff line number Diff line
@@ -71,27 +71,6 @@ struct clk_ops clk_ops1 = { 
	.disable	= __clk_disable1,

};

#endif /* MCFPM_PPMCR1 */



struct clk *clk_get(struct device *dev, const char *id)

{

	const char *clk_name = dev ? dev_name(dev) : id ? id : NULL;

	struct clk *clk;

	unsigned i;



	for (i = 0; (clk = mcf_clks[i]) != NULL; ++i)

		if (!strcmp(clk->name, clk_name))

			return clk;

	pr_warn("clk_get: didn't find clock %s\n", clk_name);

	return ERR_PTR(-ENOENT);

}

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)

arch/m68k/coldfire/m520x.c

+26 −25
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 


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



#include <linux/clkdev.h>

#include <linux/kernel.h>

#include <linux/param.h>

#include <linux/init.h>
@@ -48,31 +49,29 @@ DEFINE_CLK(0, "sys.0", 40, MCF_BUSCLK); 
DEFINE_CLK(0, "gpio.0", 41, MCF_BUSCLK);

DEFINE_CLK(0, "sdram.0", 42, MCF_CLK);



struct clk *mcf_clks[] = {

	&__clk_0_2, /* flexbus */

	&__clk_0_12, /* fec.0 */

	&__clk_0_17, /* edma */

	&__clk_0_18, /* intc.0 */

	&__clk_0_21, /* iack.0 */

	&__clk_0_22, /* imx1-i2c.0 */

	&__clk_0_23, /* mcfqspi.0 */

	&__clk_0_24, /* mcfuart.0 */

	&__clk_0_25, /* mcfuart.1 */

	&__clk_0_26, /* mcfuart.2 */

	&__clk_0_28, /* mcftmr.0 */

	&__clk_0_29, /* mcftmr.1 */

	&__clk_0_30, /* mcftmr.2 */

	&__clk_0_31, /* mcftmr.3 */



	&__clk_0_32, /* mcfpit.0 */

	&__clk_0_33, /* mcfpit.1 */

	&__clk_0_34, /* mcfeport.0 */

	&__clk_0_35, /* mcfwdt.0 */

	&__clk_0_36, /* pll.0 */

	&__clk_0_40, /* sys.0 */

	&__clk_0_41, /* gpio.0 */

	&__clk_0_42, /* sdram.0 */

	NULL,

static struct clk_lookup m520x_clk_lookup[] = {

	CLKDEV_INIT(NULL, "flexbus", &__clk_0_2),

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

	CLKDEV_INIT("edma", NULL, &__clk_0_17),

	CLKDEV_INIT("intc.0", NULL, &__clk_0_18),

	CLKDEV_INIT("iack.0", NULL, &__clk_0_21),

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

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

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

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

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

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

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

	CLKDEV_INIT("mcftmr.2", NULL, &__clk_0_30),

	CLKDEV_INIT("mcftmr.3", NULL, &__clk_0_31),

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

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

	CLKDEV_INIT("mcfeport.0", NULL, &__clk_0_34),

	CLKDEV_INIT("mcfwdt.0", NULL, &__clk_0_35),

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

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

	CLKDEV_INIT("gpio.0", NULL, &__clk_0_41),

	CLKDEV_INIT("sdram.0", NULL, &__clk_0_42),

};



static struct clk * const enable_clks[] __initconst = {
@@ -115,6 +114,8 @@ static void __init m520x_clk_init(void) 
	/* make sure these clocks are disabled */

	for (i = 0; i < ARRAY_SIZE(disable_clks); ++i)

		__clk_init_disabled(disable_clks[i]);



	clkdev_add_table(m520x_clk_lookup, ARRAY_SIZE(m520x_clk_lookup));

}



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

arch/m68k/coldfire/m53xx.c

+39 −39
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>
@@ -65,45 +66,42 @@ DEFINE_CLK(1, "mdha.0", 32, MCF_CLK); 
DEFINE_CLK(1, "skha.0", 33, MCF_CLK);

DEFINE_CLK(1, "rng.0", 34, MCF_CLK);



struct clk *mcf_clks[] = {

	&__clk_0_2,	/* flexbus */

	&__clk_0_8,	/* mcfcan.0 */

	&__clk_0_12,	/* fec.0 */

	&__clk_0_17,	/* edma */

	&__clk_0_18,	/* intc.0 */

	&__clk_0_19,	/* intc.1 */

	&__clk_0_21,	/* iack.0 */

	&__clk_0_22,	/* imx1-i2c.0 */

	&__clk_0_23,	/* mcfqspi.0 */

	&__clk_0_24,	/* mcfuart.0 */

	&__clk_0_25,	/* mcfuart.1 */

	&__clk_0_26,	/* mcfuart.2 */

	&__clk_0_28,	/* mcftmr.0 */

	&__clk_0_29,	/* mcftmr.1 */

	&__clk_0_30,	/* mcftmr.2 */

	&__clk_0_31,	/* mcftmr.3 */



	&__clk_0_32,	/* mcfpit.0 */

	&__clk_0_33,	/* mcfpit.1 */

	&__clk_0_34,	/* mcfpit.2 */

	&__clk_0_35,	/* mcfpit.3 */

	&__clk_0_36,	/* mcfpwm.0 */

	&__clk_0_37,	/* mcfeport.0 */

	&__clk_0_38,	/* mcfwdt.0 */

	&__clk_0_40,	/* sys.0 */

	&__clk_0_41,	/* gpio.0 */

	&__clk_0_42,	/* mcfrtc.0 */

	&__clk_0_43,	/* mcflcd.0 */

	&__clk_0_44,	/* mcfusb-otg.0 */

	&__clk_0_45,	/* mcfusb-host.0 */

	&__clk_0_46,	/* sdram.0 */

	&__clk_0_47,	/* ssi.0 */

	&__clk_0_48,	/* pll.0 */



	&__clk_1_32,	/* mdha.0 */

	&__clk_1_33,	/* skha.0 */

	&__clk_1_34,	/* rng.0 */

	NULL,

static struct clk_lookup m53xx_clk_lookup[] = {

	CLKDEV_INIT("flexbus", NULL, &__clk_0_2),

	CLKDEV_INIT("mcfcan.0", NULL, &__clk_0_8),

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

	CLKDEV_INIT("edma", NULL, &__clk_0_17),

	CLKDEV_INIT("intc.0", NULL, &__clk_0_18),

	CLKDEV_INIT("intc.1", NULL, &__clk_0_19),

	CLKDEV_INIT("iack.0", NULL, &__clk_0_21),

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

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

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

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

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

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

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

	CLKDEV_INIT("mcftmr.2", NULL, &__clk_0_30),

	CLKDEV_INIT("mcftmr.3", NULL, &__clk_0_31),

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

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

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

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

	CLKDEV_INIT("mcfpwm.0", NULL, &__clk_0_36),

	CLKDEV_INIT("mcfeport.0", NULL, &__clk_0_37),

	CLKDEV_INIT("mcfwdt.0", NULL, &__clk_0_38),

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

	CLKDEV_INIT("gpio.0", NULL, &__clk_0_41),

	CLKDEV_INIT("mcfrtc.0", NULL, &__clk_0_42),

	CLKDEV_INIT("mcflcd.0", NULL, &__clk_0_43),

	CLKDEV_INIT("mcfusb-otg.0", NULL, &__clk_0_44),

	CLKDEV_INIT("mcfusb-host.0", NULL, &__clk_0_45),

	CLKDEV_INIT("sdram.0", NULL, &__clk_0_46),

	CLKDEV_INIT("ssi.0", NULL, &__clk_0_47),

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

	CLKDEV_INIT("mdha.0", NULL, &__clk_1_32),

	CLKDEV_INIT("skha.0", NULL, &__clk_1_33),

	CLKDEV_INIT("rng.0", NULL, &__clk_1_34),

};



static struct clk * const enable_clks[] __initconst = {
@@ -158,6 +156,8 @@ static void __init m53xx_clk_init(void) 
	/* make sure these clocks are disabled */

	for (i = 0; i < ARRAY_SIZE(disable_clks); ++i)

		__clk_init_disabled(disable_clks[i]);



	clkdev_add_table(m53xx_clk_lookup, ARRAY_SIZE(m53xx_clk_lookup));

}



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

arch/m68k/coldfire/m5441x.c

+62 −64
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
 *	(C) Copyright Steven King <sfking@fdwdc.com>

 */



#include <linux/clkdev.h>

#include <linux/kernel.h>

#include <linux/param.h>

#include <linux/init.h>
@@ -78,72 +79,67 @@ DEFINE_CLK(2, "ipg.0", 0, MCF_CLK); 
DEFINE_CLK(2, "ahb.0", 1, MCF_CLK);

DEFINE_CLK(2, "per.0", 2, MCF_CLK);



struct clk *mcf_clks[] = {

	&__clk_0_2,

	&__clk_0_8,

	&__clk_0_9,

	&__clk_0_14,

	&__clk_0_15,

	&__clk_0_17,

	&__clk_0_18,

	&__clk_0_19,

	&__clk_0_20,

	&__clk_0_22,

	&__clk_0_23,

	&__clk_0_24,

	&__clk_0_25,

	&__clk_0_26,

	&__clk_0_27,

	&__clk_0_28,

	&__clk_0_29,

	&__clk_0_30,

	&__clk_0_31,

	&__clk_0_32,

	&__clk_0_33,

	&__clk_0_34,

	&__clk_0_35,

	&__clk_0_37,

	&__clk_0_38,

	&__clk_0_39,

	&__clk_0_42,

	&__clk_0_43,

	&__clk_0_44,

	&__clk_0_45,

	&__clk_0_46,

	&__clk_0_47,

	&__clk_0_48,

	&__clk_0_49,

	&__clk_0_50,

	&__clk_0_51,

	&__clk_0_53,

	&__clk_0_54,

	&__clk_0_55,

	&__clk_0_56,

	&__clk_0_63,



	&__clk_1_2,

	&__clk_1_4,

	&__clk_1_5,

	&__clk_1_6,

	&__clk_1_7,

	&__clk_1_24,

	&__clk_1_25,

	&__clk_1_26,

	&__clk_1_27,

	&__clk_1_28,

	&__clk_1_29,

	&__clk_1_34,

	&__clk_1_36,

	&__clk_1_37,



	&__clk_2_0,

	&__clk_2_1,

	&__clk_2_2,



	NULL,

static struct clk_lookup m5411x_clk_lookup[] = {

	CLKDEV_INIT("flexbus", NULL, &__clk_0_2),

	CLKDEV_INIT("mcfcan.0", NULL, &__clk_0_8),

	CLKDEV_INIT("mcfcan.1", NULL, &__clk_0_9),

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

	CLKDEV_INIT("mcfdspi.1", NULL, &__clk_0_15),

	CLKDEV_INIT("edma", NULL, &__clk_0_17),

	CLKDEV_INIT("intc.0", NULL, &__clk_0_18),

	CLKDEV_INIT("intc.1", NULL, &__clk_0_19),

	CLKDEV_INIT("intc.2", NULL, &__clk_0_20),

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

	CLKDEV_INIT("fsl-dspi.0", NULL, &__clk_0_23),

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

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

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

	CLKDEV_INIT("mcfuart.3", NULL, &__clk_0_27),

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

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

	CLKDEV_INIT("mcftmr.2", NULL, &__clk_0_30),

	CLKDEV_INIT("mcftmr.3", NULL, &__clk_0_31),

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

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

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

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

	CLKDEV_INIT("mcfeport.0", NULL, &__clk_0_37),

	CLKDEV_INIT("mcfadc.0", NULL, &__clk_0_38),

	CLKDEV_INIT("mcfdac.0", NULL, &__clk_0_39),

	CLKDEV_INIT("mcfrtc.0", NULL, &__clk_0_42),

	CLKDEV_INIT("mcfsim.0", NULL, &__clk_0_43),

	CLKDEV_INIT("mcfusb-otg.0", NULL, &__clk_0_44),

	CLKDEV_INIT("mcfusb-host.0", NULL, &__clk_0_45),

	CLKDEV_INIT("mcfddr-sram.0", NULL, &__clk_0_46),

	CLKDEV_INIT("mcfssi.0", NULL, &__clk_0_47),

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

	CLKDEV_INIT("mcfrng.0", NULL, &__clk_0_49),

	CLKDEV_INIT("mcfssi.1", NULL, &__clk_0_50),

	CLKDEV_INIT("sdhci-esdhc-mcf.0", NULL, &__clk_0_51),

	CLKDEV_INIT("enet-fec.0", NULL, &__clk_0_53),

	CLKDEV_INIT("enet-fec.1", NULL, &__clk_0_54),

	CLKDEV_INIT("switch.0", NULL, &__clk_0_55),

	CLKDEV_INIT("switch.1", NULL, &__clk_0_56),

	CLKDEV_INIT("nand.0", NULL, &__clk_0_63),

	CLKDEV_INIT("mcfow.0", NULL, &__clk_1_2),

	CLKDEV_INIT("imx1-i2c.2", NULL, &__clk_1_4),

	CLKDEV_INIT("imx1-i2c.3", NULL, &__clk_1_5),

	CLKDEV_INIT("imx1-i2c.4", NULL, &__clk_1_6),

	CLKDEV_INIT("imx1-i2c.5", NULL, &__clk_1_7),

	CLKDEV_INIT("mcfuart.4", NULL, &__clk_1_24),

	CLKDEV_INIT("mcfuart.5", NULL, &__clk_1_25),

	CLKDEV_INIT("mcfuart.6", NULL, &__clk_1_26),

	CLKDEV_INIT("mcfuart.7", NULL, &__clk_1_27),

	CLKDEV_INIT("mcfuart.8", NULL, &__clk_1_28),

	CLKDEV_INIT("mcfuart.9", NULL, &__clk_1_29),

	CLKDEV_INIT("mcfpwm.0", NULL, &__clk_1_34),

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

	CLKDEV_INIT("gpio.0", NULL, &__clk_1_37),

	CLKDEV_INIT("ipg.0", NULL, &__clk_2_0),

	CLKDEV_INIT("ahb.0", NULL, &__clk_2_1),

	CLKDEV_INIT("per.0", NULL, &__clk_2_2),

};





static struct clk * const enable_clks[] __initconst = {

	/* make sure these clocks are enabled */

	&__clk_0_15, /* dspi.1 */
@@ -228,6 +224,8 @@ static void __init m5441x_clk_init(void) 
	/* make sure these clocks are disabled */

	for (i = 0; i < ARRAY_SIZE(disable_clks); ++i)

		__clk_init_disabled(disable_clks[i]);



	clkdev_add_table(m5411x_clk_lookup, ARRAY_SIZE(m5411x_clk_lookup));

}



static void __init m5441x_uarts_init(void)