Skip to content

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

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
Hide whitespace changes
Inline Side-by-side
Showing with 153 additions and 206 deletions
arch/m68k/Kconfig.cpu
View file @ 63aadb77
...@@ -328,6 +328,10 @@ config COLDFIRE_SLTIMERS ...@@ -328,6 +328,10 @@ config COLDFIRE_SLTIMERS
bool bool
select LEGACY_TIMER_TICK select LEGACY_TIMER_TICK
config COLDFIRE_CLKDEV_LOOKUP
def_bool !(M5206 || M5206e || M53xx || M5441x)
select CLKDEV_LOOKUP
endif # COLDFIRE endif # COLDFIRE
......
arch/m68k/coldfire/clk.c
View file @ 63aadb77
...@@ -71,7 +71,6 @@ struct clk_ops clk_ops1 = { ...@@ -71,7 +71,6 @@ struct clk_ops clk_ops1 = {
.disable = __clk_disable1, .disable = __clk_disable1,
}; };
#endif /* MCFPM_PPMCR1 */ #endif /* MCFPM_PPMCR1 */
#endif /* MCFPM_PPMCR0 */
struct clk *clk_get(struct device *dev, const char *id) struct clk *clk_get(struct device *dev, const char *id)
{ {
...@@ -87,6 +86,14 @@ 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); 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) int clk_enable(struct clk *clk)
{ {
unsigned long flags; unsigned long flags;
...@@ -117,13 +124,6 @@ void clk_disable(struct clk *clk) ...@@ -117,13 +124,6 @@ void clk_disable(struct clk *clk)
} }
EXPORT_SYMBOL(clk_disable); 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) unsigned long clk_get_rate(struct clk *clk)
{ {
if (!clk) if (!clk)
......
arch/m68k/coldfire/m5206.c
View file @ 63aadb77
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
/***************************************************************************/ /***************************************************************************/
#include <linux/clkdev.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/param.h> #include <linux/param.h>
#include <linux/init.h> #include <linux/init.h>
...@@ -23,21 +24,15 @@ ...@@ -23,21 +24,15 @@
DEFINE_CLK(pll, "pll.0", MCF_CLK); DEFINE_CLK(pll, "pll.0", MCF_CLK);
DEFINE_CLK(sys, "sys.0", MCF_BUSCLK); 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[] = { static struct clk_lookup m5206_clk_lookup[] = {
&clk_pll, CLKDEV_INIT(NULL, "pll.0", &clk_pll),
&clk_sys, CLKDEV_INIT(NULL, "sys.0", &clk_sys),
&clk_mcftmr0, CLKDEV_INIT("mcftmr.0", NULL, &clk_sys),
&clk_mcftmr1, CLKDEV_INIT("mcftmr.1", NULL, &clk_sys),
&clk_mcfuart0, CLKDEV_INIT("mcfuart.0", NULL, &clk_sys),
&clk_mcfuart1, CLKDEV_INIT("mcfuart.1", NULL, &clk_sys),
&clk_mcfi2c0, CLKDEV_INIT("imx1-i2c.0", NULL, &clk_sys),
NULL
}; };
/***************************************************************************/ /***************************************************************************/
...@@ -66,6 +61,8 @@ void __init config_BSP(char *commandp, int size) ...@@ -66,6 +61,8 @@ void __init config_BSP(char *commandp, int size)
mcf_mapirq2imr(28, MCFINTC_EINT4); mcf_mapirq2imr(28, MCFINTC_EINT4);
mcf_mapirq2imr(31, MCFINTC_EINT7); mcf_mapirq2imr(31, MCFINTC_EINT7);
m5206_i2c_init(); m5206_i2c_init();
clkdev_add_table(m5206_clk_lookup, ARRAY_SIZE(m5206_clk_lookup));
} }
/***************************************************************************/ /***************************************************************************/
arch/m68k/coldfire/m523x.c
View file @ 63aadb77
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
/***************************************************************************/ /***************************************************************************/
#include <linux/clkdev.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/param.h> #include <linux/param.h>
#include <linux/init.h> #include <linux/init.h>
...@@ -26,31 +27,20 @@ ...@@ -26,31 +27,20 @@
DEFINE_CLK(pll, "pll.0", MCF_CLK); DEFINE_CLK(pll, "pll.0", MCF_CLK);
DEFINE_CLK(sys, "sys.0", MCF_BUSCLK); DEFINE_CLK(sys, "sys.0", MCF_BUSCLK);
DEFINE_CLK(mcfpit0, "mcfpit.0", MCF_CLK);
DEFINE_CLK(mcfpit1, "mcfpit.1", MCF_CLK); struct clk_lookup m523x_clk_lookup[] = {
DEFINE_CLK(mcfpit2, "mcfpit.2", MCF_CLK); CLKDEV_INIT(NULL, "pll.0", &clk_pll),
DEFINE_CLK(mcfpit3, "mcfpit.3", MCF_CLK); CLKDEV_INIT(NULL, "sys.0", &clk_sys),
DEFINE_CLK(mcfuart0, "mcfuart.0", MCF_BUSCLK); CLKDEV_INIT("mcfpit.0", NULL, &clk_pll),
DEFINE_CLK(mcfuart1, "mcfuart.1", MCF_BUSCLK); CLKDEV_INIT("mcfpit.1", NULL, &clk_pll),
DEFINE_CLK(mcfuart2, "mcfuart.2", MCF_BUSCLK); CLKDEV_INIT("mcfpit.2", NULL, &clk_pll),
DEFINE_CLK(mcfqspi0, "mcfqspi.0", MCF_BUSCLK); CLKDEV_INIT("mcfpit.3", NULL, &clk_pll),
DEFINE_CLK(fec0, "fec.0", MCF_BUSCLK); CLKDEV_INIT("mcfuart.0", NULL, &clk_sys),
DEFINE_CLK(mcfi2c0, "imx1-i2c.0", MCF_BUSCLK); CLKDEV_INIT("mcfuart.1", NULL, &clk_sys),
CLKDEV_INIT("mcfuart.2", NULL, &clk_sys),
struct clk *mcf_clks[] = { CLKDEV_INIT("mcfqspi.0", NULL, &clk_sys),
&clk_pll, CLKDEV_INIT("fec.0", NULL, &clk_sys),
&clk_sys, CLKDEV_INIT("imx1-i2c.0", NULL, &clk_sys),
&clk_mcfpit0,
&clk_mcfpit1,
&clk_mcfpit2,
&clk_mcfpit3,
&clk_mcfuart0,
&clk_mcfuart1,
&clk_mcfuart2,
&clk_mcfqspi0,
&clk_fec0,
&clk_mcfi2c0,
NULL
}; };
/***************************************************************************/ /***************************************************************************/
...@@ -100,6 +90,8 @@ void __init config_BSP(char *commandp, int size) ...@@ -100,6 +90,8 @@ void __init config_BSP(char *commandp, int size)
m523x_fec_init(); m523x_fec_init();
m523x_qspi_init(); m523x_qspi_init();
m523x_i2c_init(); m523x_i2c_init();
clkdev_add_table(m523x_clk_lookup, ARRAY_SIZE(m523x_clk_lookup));
} }
/***************************************************************************/ /***************************************************************************/
arch/m68k/coldfire/m5249.c
View file @ 63aadb77
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
/***************************************************************************/ /***************************************************************************/
#include <linux/clkdev.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/param.h> #include <linux/param.h>
#include <linux/init.h> #include <linux/init.h>
...@@ -23,25 +24,17 @@ ...@@ -23,25 +24,17 @@
DEFINE_CLK(pll, "pll.0", MCF_CLK); DEFINE_CLK(pll, "pll.0", MCF_CLK);
DEFINE_CLK(sys, "sys.0", MCF_BUSCLK); DEFINE_CLK(sys, "sys.0", MCF_BUSCLK);
DEFINE_CLK(mcftmr0, "mcftmr.0", MCF_BUSCLK);
DEFINE_CLK(mcftmr1, "mcftmr.1", MCF_BUSCLK); struct clk_lookup m5249_clk_lookup[] = {
DEFINE_CLK(mcfuart0, "mcfuart.0", MCF_BUSCLK); CLKDEV_INIT(NULL, "pll.0", &clk_pll),
DEFINE_CLK(mcfuart1, "mcfuart.1", MCF_BUSCLK); CLKDEV_INIT(NULL, "sys.0", &clk_sys),
DEFINE_CLK(mcfqspi0, "mcfqspi.0", MCF_BUSCLK); CLKDEV_INIT("mcftmr.0", NULL, &clk_sys),
DEFINE_CLK(mcfi2c0, "imx1-i2c.0", MCF_BUSCLK); CLKDEV_INIT("mcftmr.1", NULL, &clk_sys),
DEFINE_CLK(mcfi2c1, "imx1-i2c.1", MCF_BUSCLK); CLKDEV_INIT("mcfuart.0", NULL, &clk_sys),
CLKDEV_INIT("mcfuart.1", NULL, &clk_sys),
struct clk *mcf_clks[] = { CLKDEV_INIT("mcfqspi.0", NULL, &clk_sys),
&clk_pll, CLKDEV_INIT("imx1-i2c.0", NULL, &clk_sys),
&clk_sys, CLKDEV_INIT("imx1-i2c.1", NULL, &clk_sys),
&clk_mcftmr0,
&clk_mcftmr1,
&clk_mcfuart0,
&clk_mcfuart1,
&clk_mcfqspi0,
&clk_mcfi2c0,
&clk_mcfi2c1,
NULL
}; };
/***************************************************************************/ /***************************************************************************/
...@@ -137,6 +130,8 @@ void __init config_BSP(char *commandp, int size) ...@@ -137,6 +130,8 @@ void __init config_BSP(char *commandp, int size)
#endif #endif
m5249_qspi_init(); m5249_qspi_init();
m5249_i2c_init(); m5249_i2c_init();
clkdev_add_table(m5249_clk_lookup, ARRAY_SIZE(m5249_clk_lookup));
} }
/***************************************************************************/ /***************************************************************************/
......
arch/m68k/coldfire/m525x.c
View file @ 63aadb77
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
/***************************************************************************/ /***************************************************************************/
#include <linux/clkdev.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/param.h> #include <linux/param.h>
#include <linux/init.h> #include <linux/init.h>
...@@ -23,25 +24,17 @@ ...@@ -23,25 +24,17 @@
DEFINE_CLK(pll, "pll.0", MCF_CLK); DEFINE_CLK(pll, "pll.0", MCF_CLK);
DEFINE_CLK(sys, "sys.0", MCF_BUSCLK); DEFINE_CLK(sys, "sys.0", MCF_BUSCLK);
DEFINE_CLK(mcftmr0, "mcftmr.0", MCF_BUSCLK);
DEFINE_CLK(mcftmr1, "mcftmr.1", MCF_BUSCLK); static struct clk_lookup m525x_clk_lookup[] = {
DEFINE_CLK(mcfuart0, "mcfuart.0", MCF_BUSCLK); CLKDEV_INIT(NULL, "pll.0", &pll),
DEFINE_CLK(mcfuart1, "mcfuart.1", MCF_BUSCLK); CLKDEV_INIT(NULL, "sys.0", &clk_sys),
DEFINE_CLK(mcfqspi0, "mcfqspi.0", MCF_BUSCLK); CLKDEV_INIT("mcftmr.0", NULL, &clk_sys),
DEFINE_CLK(mcfi2c0, "imx1-i2c.0", MCF_BUSCLK); CLKDEV_INIT("mcftmr.1", NULL, &clk_sys),
DEFINE_CLK(mcfi2c1, "imx1-i2c.1", MCF_BUSCLK); CLKDEV_INIT("mcfuart.0", NULL, &clk_sys),
CLKDEV_INIT("mcfuart.1", NULL, &clk_sys),
struct clk *mcf_clks[] = { CLKDEV_INIT("mcfqspi.0", NULL, &clk_sys),
&clk_pll, CLKDEV_INIT("imx1-i2c.0", NULL, &clk_sys),
&clk_sys, CLKDEV_INIT("imx1-i2c.1", NULL, &clk_sys),
&clk_mcftmr0,
&clk_mcftmr1,
&clk_mcfuart0,
&clk_mcfuart1,
&clk_mcfqspi0,
&clk_mcfi2c0,
&clk_mcfi2c1,
NULL
}; };
/***************************************************************************/ /***************************************************************************/
...@@ -88,6 +81,8 @@ void __init config_BSP(char *commandp, int size) ...@@ -88,6 +81,8 @@ void __init config_BSP(char *commandp, int size)
m525x_qspi_init(); m525x_qspi_init();
m525x_i2c_init(); m525x_i2c_init();
clkdev_add_table(m525x_clk_lookup, ARRAY_SIZE(m525x_clk_lookup));
} }
/***************************************************************************/ /***************************************************************************/
arch/m68k/coldfire/m5272.c
View file @ 63aadb77
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
/***************************************************************************/ /***************************************************************************/
#include <linux/clkdev.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/param.h> #include <linux/param.h>
#include <linux/init.h> #include <linux/init.h>
...@@ -34,27 +35,18 @@ unsigned char ledbank = 0xff; ...@@ -34,27 +35,18 @@ unsigned char ledbank = 0xff;
DEFINE_CLK(pll, "pll.0", MCF_CLK); DEFINE_CLK(pll, "pll.0", MCF_CLK);
DEFINE_CLK(sys, "sys.0", MCF_BUSCLK); DEFINE_CLK(sys, "sys.0", MCF_BUSCLK);
DEFINE_CLK(mcftmr0, "mcftmr.0", MCF_BUSCLK);
DEFINE_CLK(mcftmr1, "mcftmr.1", MCF_BUSCLK); static struct clk_lookup m5272_clk_lookup[] = {
DEFINE_CLK(mcftmr2, "mcftmr.2", MCF_BUSCLK); CLKDEV_INIT(NULL, "pll.0", &clk_pll),
DEFINE_CLK(mcftmr3, "mcftmr.3", MCF_BUSCLK); CLKDEV_INIT(NULL, "sys.0", &clk_sys),
DEFINE_CLK(mcfuart0, "mcfuart.0", MCF_BUSCLK); CLKDEV_INIT("mcftmr.0", NULL, &clk_sys),
DEFINE_CLK(mcfuart1, "mcfuart.1", MCF_BUSCLK); CLKDEV_INIT("mcftmr.1", NULL, &clk_sys),
DEFINE_CLK(mcfqspi0, "mcfqspi.0", MCF_BUSCLK); CLKDEV_INIT("mcftmr.2", NULL, &clk_sys),
DEFINE_CLK(fec0, "fec.0", MCF_BUSCLK); CLKDEV_INIT("mcftmr.3", NULL, &clk_sys),
CLKDEV_INIT("mcfuart.0", NULL, &clk_sys),
struct clk *mcf_clks[] = { CLKDEV_INIT("mcfuart.1", NULL, &clk_sys),
&clk_pll, CLKDEV_INIT("mcfqspi.0", NULL, &clk_sys),
&clk_sys, CLKDEV_INIT("fec.0", NULL, &clk_sys),
&clk_mcftmr0,
&clk_mcftmr1,
&clk_mcftmr2,
&clk_mcftmr3,
&clk_mcfuart0,
&clk_mcfuart1,
&clk_mcfqspi0,
&clk_fec0,
NULL
}; };
/***************************************************************************/ /***************************************************************************/
...@@ -128,6 +120,7 @@ static int __init init_BSP(void) ...@@ -128,6 +120,7 @@ static int __init init_BSP(void)
{ {
m5272_uarts_init(); m5272_uarts_init();
fixed_phy_add(PHY_POLL, 0, &nettel_fixed_phy_status); fixed_phy_add(PHY_POLL, 0, &nettel_fixed_phy_status);
clkdev_add_table(m5272_clk_lookup, ARRAY_SIZE(m5272_clk_lookup));
return 0; return 0;
} }
......
arch/m68k/coldfire/m527x.c
View file @ 63aadb77
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
/***************************************************************************/ /***************************************************************************/
#include <linux/clkdev.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/param.h> #include <linux/param.h>
#include <linux/init.h> #include <linux/init.h>
...@@ -27,33 +28,21 @@ ...@@ -27,33 +28,21 @@
DEFINE_CLK(pll, "pll.0", MCF_CLK); DEFINE_CLK(pll, "pll.0", MCF_CLK);
DEFINE_CLK(sys, "sys.0", MCF_BUSCLK); DEFINE_CLK(sys, "sys.0", MCF_BUSCLK);
DEFINE_CLK(mcfpit0, "mcfpit.0", MCF_CLK);
DEFINE_CLK(mcfpit1, "mcfpit.1", MCF_CLK); static struct clk_lookup m527x_clk_lookup[] = {
DEFINE_CLK(mcfpit2, "mcfpit.2", MCF_CLK); CLKDEV_INIT(NULL, "pll.0", &clk_pll),
DEFINE_CLK(mcfpit3, "mcfpit.3", MCF_CLK); CLKDEV_INIT(NULL, "sys.0", &clk_sys),
DEFINE_CLK(mcfuart0, "mcfuart.0", MCF_BUSCLK); CLKDEV_INIT("mcfpit.0", NULL, &clk_pll),
DEFINE_CLK(mcfuart1, "mcfuart.1", MCF_BUSCLK); CLKDEV_INIT("mcfpit.1", NULL, &clk_pll),
DEFINE_CLK(mcfuart2, "mcfuart.2", MCF_BUSCLK); CLKDEV_INIT("mcfpit.2", NULL, &clk_pll),
DEFINE_CLK(mcfqspi0, "mcfqspi.0", MCF_BUSCLK); CLKDEV_INIT("mcfpit.3", NULL, &clk_pll),
DEFINE_CLK(fec0, "fec.0", MCF_BUSCLK); CLKDEV_INIT("mcfuart.0", NULL, &clk_sys),
DEFINE_CLK(fec1, "fec.1", MCF_BUSCLK); CLKDEV_INIT("mcfuart.1", NULL, &clk_sys),
DEFINE_CLK(mcfi2c0, "imx1-i2c.0", MCF_BUSCLK); CLKDEV_INIT("mcfuart.2", NULL, &clk_sys),
CLKDEV_INIT("mcfqspi.0", NULL, &clk_sys),
struct clk *mcf_clks[] = { CLKDEV_INIT("fec.0", NULL, &clk_sys),
&clk_pll, CLKDEV_INIT("fec.1", NULL, &clk_sys),
&clk_sys, CLKDEV_INIT("imx1-i2c.0", NULL, &clk_sys),
&clk_mcfpit0,
&clk_mcfpit1,
&clk_mcfpit2,
&clk_mcfpit3,
&clk_mcfuart0,
&clk_mcfuart1,
&clk_mcfuart2,
&clk_mcfqspi0,
&clk_fec0,
&clk_fec1,
&clk_mcfi2c0,
NULL
}; };
/***************************************************************************/ /***************************************************************************/
...@@ -151,6 +140,7 @@ void __init config_BSP(char *commandp, int size) ...@@ -151,6 +140,7 @@ void __init config_BSP(char *commandp, int size)
m527x_fec_init(); m527x_fec_init();
m527x_qspi_init(); m527x_qspi_init();
m527x_i2c_init(); m527x_i2c_init();
clkdev_add_table(m527x_clk_lookup, ARRAY_SIZE(m527x_clk_lookup));
} }
/***************************************************************************/ /***************************************************************************/
arch/m68k/coldfire/m528x.c
View file @ 63aadb77
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
/***************************************************************************/ /***************************************************************************/
#include <linux/clkdev.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/param.h> #include <linux/param.h>
#include <linux/init.h> #include <linux/init.h>
...@@ -28,31 +29,20 @@ ...@@ -28,31 +29,20 @@
DEFINE_CLK(pll, "pll.0", MCF_CLK); DEFINE_CLK(pll, "pll.0", MCF_CLK);
DEFINE_CLK(sys, "sys.0", MCF_BUSCLK); DEFINE_CLK(sys, "sys.0", MCF_BUSCLK);
DEFINE_CLK(mcfpit0, "mcfpit.0", MCF_CLK);
DEFINE_CLK(mcfpit1, "mcfpit.1", MCF_CLK); static struct clk_lookup m528x_clk_lookup[] = {
DEFINE_CLK(mcfpit2, "mcfpit.2", MCF_CLK); CLKDEV_INIT(NULL, "pll.0", &clk_pll),
DEFINE_CLK(mcfpit3, "mcfpit.3", MCF_CLK); CLKDEV_INIT(NULL, "sys.0", &clk_sys),
DEFINE_CLK(mcfuart0, "mcfuart.0", MCF_BUSCLK); CLKDEV_INIT("mcfpit.0", NULL, &clk_pll),
DEFINE_CLK(mcfuart1, "mcfuart.1", MCF_BUSCLK); CLKDEV_INIT("mcfpit.1", NULL, &clk_pll),
DEFINE_CLK(mcfuart2, "mcfuart.2", MCF_BUSCLK); CLKDEV_INIT("mcfpit.2", NULL, &clk_pll),
DEFINE_CLK(mcfqspi0, "mcfqspi.0", MCF_BUSCLK); CLKDEV_INIT("mcfpit.3", NULL, &clk_pll),
DEFINE_CLK(fec0, "fec.0", MCF_BUSCLK); CLKDEV_INIT("mcfuart.0", NULL, &clk_sys),
DEFINE_CLK(mcfi2c0, "imx1-i2c.0", MCF_BUSCLK); CLKDEV_INIT("mcfuart.1", NULL, &clk_sys),
CLKDEV_INIT("mcfuart.2", NULL, &clk_sys),
struct clk *mcf_clks[] = { CLKDEV_INIT("mcfqspi.0", NULL, &clk_sys),
&clk_pll, CLKDEV_INIT("fec.0", NULL, &clk_sys),
&clk_sys, CLKDEV_INIT("imx1-i2c.0", NULL, &clk_sys),
&clk_mcfpit0,
&clk_mcfpit1,
&clk_mcfpit2,
&clk_mcfpit3,
&clk_mcfuart0,
&clk_mcfuart1,
&clk_mcfuart2,
&clk_mcfqspi0,
&clk_fec0,
&clk_mcfi2c0,
NULL
}; };
/***************************************************************************/ /***************************************************************************/
...@@ -146,6 +136,8 @@ void __init config_BSP(char *commandp, int size) ...@@ -146,6 +136,8 @@ void __init config_BSP(char *commandp, int size)
m528x_fec_init(); m528x_fec_init();
m528x_qspi_init(); m528x_qspi_init();
m528x_i2c_init(); m528x_i2c_init();
clkdev_add_table(m528x_clk_lookup, ARRAY_SIZE(m528x_clk_lookup));
} }
/***************************************************************************/ /***************************************************************************/
arch/m68k/coldfire/m5307.c
View file @ 63aadb77
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
/***************************************************************************/ /***************************************************************************/
#include <linux/clkdev.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/param.h> #include <linux/param.h>
#include <linux/init.h> #include <linux/init.h>
...@@ -32,21 +33,15 @@ unsigned char ledbank = 0xff; ...@@ -32,21 +33,15 @@ unsigned char ledbank = 0xff;
DEFINE_CLK(pll, "pll.0", MCF_CLK); DEFINE_CLK(pll, "pll.0", MCF_CLK);
DEFINE_CLK(sys, "sys.0", MCF_BUSCLK); DEFINE_CLK(sys, "sys.0", MCF_BUSCLK);
DEFINE_CLK(mcftmr0, "mcftmr.0", MCF_BUSCLK);
DEFINE_CLK(mcftmr1, "mcftmr.1", MCF_BUSCLK); static struct clk_lookup m5307_clk_lookup[] = {
DEFINE_CLK(mcfuart0, "mcfuart.0", MCF_BUSCLK); CLKDEV_INIT(NULL, "pll.0", &clk_pll),
DEFINE_CLK(mcfuart1, "mcfuart.1", MCF_BUSCLK); CLKDEV_INIT(NULL, "sys.0", &clk_sys),
DEFINE_CLK(mcfi2c0, "imx1-i2c.0", MCF_BUSCLK); CLKDEV_INIT("mcftmr.0", NULL, &clk_sys),
CLKDEV_INIT("mcftmr.1", NULL, &clk_sys),
struct clk *mcf_clks[] = { CLKDEV_INIT("mcfuart.0", NULL, &clk_sys),
&clk_pll, CLKDEV_INIT("mcfuart.1", NULL, &clk_sys),
&clk_sys, CLKDEV_INIT("imx1-i2c.0", NULL, &clk_sys),
&clk_mcftmr0,
&clk_mcftmr1,
&clk_mcfuart0,
&clk_mcfuart1,
&clk_mcfi2c0,
NULL
}; };
/***************************************************************************/ /***************************************************************************/
...@@ -88,6 +83,8 @@ void __init config_BSP(char *commandp, int size) ...@@ -88,6 +83,8 @@ void __init config_BSP(char *commandp, int size)
wdebug(MCFDEBUG_CSR, MCFDEBUG_CSR_PSTCLK); wdebug(MCFDEBUG_CSR, MCFDEBUG_CSR_PSTCLK);
#endif #endif
m5307_i2c_init(); m5307_i2c_init();
clkdev_add_table(m5307_clk_lookup, ARRAY_SIZE(m5307_clk_lookup));
} }
/***************************************************************************/ /***************************************************************************/
arch/m68k/coldfire/m5407.c
View file @ 63aadb77
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
/***************************************************************************/ /***************************************************************************/
#include <linux/clkdev.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/param.h> #include <linux/param.h>
#include <linux/init.h> #include <linux/init.h>
...@@ -23,21 +24,15 @@ ...@@ -23,21 +24,15 @@
DEFINE_CLK(pll, "pll.0", MCF_CLK); DEFINE_CLK(pll, "pll.0", MCF_CLK);
DEFINE_CLK(sys, "sys.0", MCF_BUSCLK); 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[] = { static struct clk_lookup m5407_clk_lookup[] = {
&clk_pll, CLKDEV_INIT(NULL, "pll.0", &clk_pll),
&clk_sys, CLKDEV_INIT(NULL, "sys.0", &clk_sys),
&clk_mcftmr0, CLKDEV_INIT("mcftmr.0", NULL, &clk_sys),
&clk_mcftmr1, CLKDEV_INIT("mcftmr.1", NULL, &clk_sys),
&clk_mcfuart0, CLKDEV_INIT("mcfuart.0", NULL, &clk_sys),
&clk_mcfuart1, CLKDEV_INIT("mcfuart.1", NULL, &clk_sys),
&clk_mcfi2c0, CLKDEV_INIT("imx1-i2c.0", NULL, &clk_sys),
NULL
}; };
/***************************************************************************/ /***************************************************************************/
...@@ -63,6 +58,8 @@ void __init config_BSP(char *commandp, int size) ...@@ -63,6 +58,8 @@ void __init config_BSP(char *commandp, int size)
mcf_mapirq2imr(29, MCFINTC_EINT5); mcf_mapirq2imr(29, MCFINTC_EINT5);
mcf_mapirq2imr(31, MCFINTC_EINT7); mcf_mapirq2imr(31, MCFINTC_EINT7);
m5407_i2c_init(); m5407_i2c_init();
clkdev_add_table(m5407_clk_lookup, ARRAY_SIZE(m5407_clk_lookup));
} }
/***************************************************************************/ /***************************************************************************/
arch/m68k/coldfire/m54xx.c
View file @ 63aadb77
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
/***************************************************************************/ /***************************************************************************/
#include <linux/clkdev.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/param.h> #include <linux/param.h>
#include <linux/init.h> #include <linux/init.h>
...@@ -32,25 +33,17 @@ ...@@ -32,25 +33,17 @@
DEFINE_CLK(pll, "pll.0", MCF_CLK); DEFINE_CLK(pll, "pll.0", MCF_CLK);
DEFINE_CLK(sys, "sys.0", MCF_BUSCLK); DEFINE_CLK(sys, "sys.0", MCF_BUSCLK);
DEFINE_CLK(mcfslt0, "mcfslt.0", MCF_BUSCLK);
DEFINE_CLK(mcfslt1, "mcfslt.1", MCF_BUSCLK); static struct clk_lookup m54xx_clk_lookup[] = {
DEFINE_CLK(mcfuart0, "mcfuart.0", MCF_BUSCLK); CLKDEV_INIT(NULL, "pll.0", &clk_pll),
DEFINE_CLK(mcfuart1, "mcfuart.1", MCF_BUSCLK); CLKDEV_INIT(NULL, "sys.0", &clk_sys),
DEFINE_CLK(mcfuart2, "mcfuart.2", MCF_BUSCLK); CLKDEV_INIT("mcfslt.0", NULL, &clk_sys),
DEFINE_CLK(mcfuart3, "mcfuart.3", MCF_BUSCLK); CLKDEV_INIT("mcfslt.1", NULL, &clk_sys),
DEFINE_CLK(mcfi2c0, "imx1-i2c.0", MCF_BUSCLK); CLKDEV_INIT("mcfuart.0", NULL, &clk_sys),
CLKDEV_INIT("mcfuart.1", NULL, &clk_sys),
struct clk *mcf_clks[] = { CLKDEV_INIT("mcfuart.2", NULL, &clk_sys),
&clk_pll, CLKDEV_INIT("mcfuart.3", NULL, &clk_sys),
&clk_sys, CLKDEV_INIT("imx1-i2c.0", NULL, &clk_sys),
&clk_mcfslt0,
&clk_mcfslt1,
&clk_mcfuart0,
&clk_mcfuart1,
&clk_mcfuart2,
&clk_mcfuart3,
&clk_mcfi2c0,
NULL
}; };
/***************************************************************************/ /***************************************************************************/
...@@ -100,6 +93,8 @@ void __init config_BSP(char *commandp, int size) ...@@ -100,6 +93,8 @@ void __init config_BSP(char *commandp, int size)
mach_sched_init = hw_timer_init; mach_sched_init = hw_timer_init;
m54xx_uarts_init(); m54xx_uarts_init();
m54xx_i2c_init(); m54xx_i2c_init();
clkdev_add_table(m54xx_clk_lookup, ARRAY_SIZE(m54xx_clk_lookup));
} }
/***************************************************************************/ /***************************************************************************/
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7