Skip to content

L
linux
Commit 4c5519fa authored by Stephen Boyd's avatar Stephen Boyd
Browse files
Options

Merge tag 'clkdev-cleanup' of... 

Merge tag 'clkdev-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic into clk-legacy

Pull "clean up legacy clock interfaces" series from Arnd Bergmann:

A recent discussion about legacy clk interface users revealed
that there are only two platforms remaining that provide their own
clk_get()/clk_put() implementations, MIPS ar7 and and m68k coldfire.

I managed to rework both of these to just use the normal clkdev code,
and fold CONFIG_CLKDEV_LOOKUP into CONFIG_HAVE_CLK as it is now shared
among all users.

As I noticed that the ar7 clock implementation and the ralink version
are rather trivial, I ended up converting those to use the common-clk
interfaces as well, though this is unrelated to the other changes.

Link: https://lore.kernel.org/linux-clk/20210531184749.2475868-1-arnd@kernel.org/
Link: https://lore.kernel.org/lkml/CAK8P3a2XsrfUJQQAfnGknh8HiA-D9L_wmEoAgXU89KqagE31NQ@mail.gmail.com/Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>

* tag 'clkdev-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
  clkdev: remove unused clkdev_alloc() interfaces
  clkdev: remove CONFIG_CLKDEV_LOOKUP
  m68k: coldfire: remove private clk_get/clk_put
  m68k: coldfire: use clkdev_lookup on most coldfire
  mips: ralink: convert to CONFIG_COMMON_CLK
  mips: ar7: convert to CONFIG_COMMON_CLK
  mips: ar7: convert to clkdev_lookup
parents 6efb943b 5617c912
Hide whitespace changes
Inline Side-by-side
Showing with 318 additions and 568 deletions
arch/arm/Kconfig
View file @ 4c5519fa
...@@ -353,7 +353,6 @@ config ARCH_EP93XX ...@@ -353,7 +353,6 @@ config ARCH_EP93XX
select ARM_VIC select ARM_VIC
select GENERIC_IRQ_MULTI_HANDLER select GENERIC_IRQ_MULTI_HANDLER
select AUTO_ZRELADDR select AUTO_ZRELADDR
select CLKDEV_LOOKUP
select CLKSRC_MMIO select CLKSRC_MMIO
select CPU_ARM920T select CPU_ARM920T
select GPIOLIB select GPIOLIB
...@@ -504,7 +503,6 @@ config ARCH_OMAP1 ...@@ -504,7 +503,6 @@ config ARCH_OMAP1
bool "TI OMAP1" bool "TI OMAP1"
depends on MMU depends on MMU
select ARCH_OMAP select ARCH_OMAP
select CLKDEV_LOOKUP
select CLKSRC_MMIO select CLKSRC_MMIO
select GENERIC_IRQ_CHIP select GENERIC_IRQ_CHIP
select GENERIC_IRQ_MULTI_HANDLER select GENERIC_IRQ_MULTI_HANDLER
......
arch/m68k/coldfire/clk.c
View file @ 4c5519fa
...@@ -73,20 +73,6 @@ struct clk_ops clk_ops1 = { ...@@ -73,20 +73,6 @@ struct clk_ops clk_ops1 = {
#endif /* MCFPM_PPMCR1 */ #endif /* MCFPM_PPMCR1 */
#endif /* MCFPM_PPMCR0 */ #endif /* MCFPM_PPMCR0 */
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);
int clk_enable(struct clk *clk) int clk_enable(struct clk *clk)
{ {
unsigned long flags; unsigned long flags;
...@@ -117,13 +103,6 @@ void clk_disable(struct clk *clk) ...@@ -117,13 +103,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 @ 4c5519fa
...@@ -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/m520x.c
View file @ 4c5519fa
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,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>
...@@ -48,31 +49,29 @@ DEFINE_CLK(0, "sys.0", 40, MCF_BUSCLK); ...@@ -48,31 +49,29 @@ DEFINE_CLK(0, "sys.0", 40, MCF_BUSCLK);
DEFINE_CLK(0, "gpio.0", 41, MCF_BUSCLK); DEFINE_CLK(0, "gpio.0", 41, MCF_BUSCLK);
DEFINE_CLK(0, "sdram.0", 42, MCF_CLK); DEFINE_CLK(0, "sdram.0", 42, MCF_CLK);
struct clk *mcf_clks[] = { static struct clk_lookup m520x_clk_lookup[] = {
&__clk_0_2, /* flexbus */ CLKDEV_INIT(NULL, "flexbus", &__clk_0_2),
&__clk_0_12, /* fec.0 */ CLKDEV_INIT("fec.0", NULL, &__clk_0_12),
&__clk_0_17, /* edma */ CLKDEV_INIT("edma", NULL, &__clk_0_17),
&__clk_0_18, /* intc.0 */ CLKDEV_INIT("intc.0", NULL, &__clk_0_18),
&__clk_0_21, /* iack.0 */ CLKDEV_INIT("iack.0", NULL, &__clk_0_21),
&__clk_0_22, /* imx1-i2c.0 */ CLKDEV_INIT("imx1-i2c.0", NULL, &__clk_0_22),
&__clk_0_23, /* mcfqspi.0 */ CLKDEV_INIT("mcfqspi.0", NULL, &__clk_0_23),
&__clk_0_24, /* mcfuart.0 */ CLKDEV_INIT("mcfuart.0", NULL, &__clk_0_24),
&__clk_0_25, /* mcfuart.1 */ CLKDEV_INIT("mcfuart.1", NULL, &__clk_0_25),
&__clk_0_26, /* mcfuart.2 */ CLKDEV_INIT("mcfuart.2", NULL, &__clk_0_26),
&__clk_0_28, /* mcftmr.0 */ CLKDEV_INIT("mcftmr.0", NULL, &__clk_0_28),
&__clk_0_29, /* mcftmr.1 */ CLKDEV_INIT("mcftmr.1", NULL, &__clk_0_29),
&__clk_0_30, /* mcftmr.2 */ CLKDEV_INIT("mcftmr.2", NULL, &__clk_0_30),
&__clk_0_31, /* mcftmr.3 */ CLKDEV_INIT("mcftmr.3", NULL, &__clk_0_31),
CLKDEV_INIT("mcfpit.0", NULL, &__clk_0_32),
&__clk_0_32, /* mcfpit.0 */ CLKDEV_INIT("mcfpit.1", NULL, &__clk_0_33),
&__clk_0_33, /* mcfpit.1 */ CLKDEV_INIT("mcfeport.0", NULL, &__clk_0_34),
&__clk_0_34, /* mcfeport.0 */ CLKDEV_INIT("mcfwdt.0", NULL, &__clk_0_35),
&__clk_0_35, /* mcfwdt.0 */ CLKDEV_INIT(NULL, "pll.0", &__clk_0_36),
&__clk_0_36, /* pll.0 */ CLKDEV_INIT(NULL, "sys.0", &__clk_0_40),
&__clk_0_40, /* sys.0 */ CLKDEV_INIT("gpio.0", NULL, &__clk_0_41),
&__clk_0_41, /* gpio.0 */ CLKDEV_INIT("sdram.0", NULL, &__clk_0_42),
&__clk_0_42, /* sdram.0 */
NULL,
}; };
static struct clk * const enable_clks[] __initconst = { static struct clk * const enable_clks[] __initconst = {
...@@ -115,6 +114,8 @@ static void __init m520x_clk_init(void) ...@@ -115,6 +114,8 @@ static void __init m520x_clk_init(void)
/* make sure these clocks are disabled */ /* make sure these clocks are disabled */
for (i = 0; i < ARRAY_SIZE(disable_clks); ++i) for (i = 0; i < ARRAY_SIZE(disable_clks); ++i)
__clk_init_disabled(disable_clks[i]); __clk_init_disabled(disable_clks[i]);
clkdev_add_table(m520x_clk_lookup, ARRAY_SIZE(m520x_clk_lookup));
} }
/***************************************************************************/ /***************************************************************************/
......
arch/m68k/coldfire/m523x.c
View file @ 4c5519fa
...@@ -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 @ 4c5519fa
...@@ -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 @ 4c5519fa
...@@ -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 @ 4c5519fa
...@@ -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 @ 4c5519fa
...@@ -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 @ 4c5519fa
...@@ -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 @ 4c5519fa
...@@ -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/m53xx.c
View file @ 4c5519fa
...@@ -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>
...@@ -65,45 +66,42 @@ DEFINE_CLK(1, "mdha.0", 32, MCF_CLK); ...@@ -65,45 +66,42 @@ DEFINE_CLK(1, "mdha.0", 32, MCF_CLK);
DEFINE_CLK(1, "skha.0", 33, MCF_CLK); DEFINE_CLK(1, "skha.0", 33, MCF_CLK);
DEFINE_CLK(1, "rng.0", 34, MCF_CLK); DEFINE_CLK(1, "rng.0", 34, MCF_CLK);
struct clk *mcf_clks[] = { static struct clk_lookup m53xx_clk_lookup[] = {
&__clk_0_2, /* flexbus */ CLKDEV_INIT("flexbus", NULL, &__clk_0_2),
&__clk_0_8, /* mcfcan.0 */ CLKDEV_INIT("mcfcan.0", NULL, &__clk_0_8),
&__clk_0_12, /* fec.0 */ CLKDEV_INIT("fec.0", NULL, &__clk_0_12),
&__clk_0_17, /* edma */ CLKDEV_INIT("edma", NULL, &__clk_0_17),
&__clk_0_18, /* intc.0 */ CLKDEV_INIT("intc.0", NULL, &__clk_0_18),
&__clk_0_19, /* intc.1 */ CLKDEV_INIT("intc.1", NULL, &__clk_0_19),
&__clk_0_21, /* iack.0 */ CLKDEV_INIT("iack.0", NULL, &__clk_0_21),
&__clk_0_22, /* imx1-i2c.0 */ CLKDEV_INIT("imx1-i2c.0", NULL, &__clk_0_22),
&__clk_0_23, /* mcfqspi.0 */ CLKDEV_INIT("mcfqspi.0", NULL, &__clk_0_23),
&__clk_0_24, /* mcfuart.0 */ CLKDEV_INIT("mcfuart.0", NULL, &__clk_0_24),
&__clk_0_25, /* mcfuart.1 */ CLKDEV_INIT("mcfuart.1", NULL, &__clk_0_25),
&__clk_0_26, /* mcfuart.2 */ CLKDEV_INIT("mcfuart.2", NULL, &__clk_0_26),
&__clk_0_28, /* mcftmr.0 */ CLKDEV_INIT("mcftmr.0", NULL, &__clk_0_28),
&__clk_0_29, /* mcftmr.1 */ CLKDEV_INIT("mcftmr.1", NULL, &__clk_0_29),
&__clk_0_30, /* mcftmr.2 */ CLKDEV_INIT("mcftmr.2", NULL, &__clk_0_30),
&__clk_0_31, /* mcftmr.3 */ CLKDEV_INIT("mcftmr.3", NULL, &__clk_0_31),
CLKDEV_INIT("mcfpit.0", NULL, &__clk_0_32),
&__clk_0_32, /* mcfpit.0 */ CLKDEV_INIT("mcfpit.1", NULL, &__clk_0_33),
&__clk_0_33, /* mcfpit.1 */ CLKDEV_INIT("mcfpit.2", NULL, &__clk_0_34),
&__clk_0_34, /* mcfpit.2 */ CLKDEV_INIT("mcfpit.3", NULL, &__clk_0_35),
&__clk_0_35, /* mcfpit.3 */ CLKDEV_INIT("mcfpwm.0", NULL, &__clk_0_36),
&__clk_0_36, /* mcfpwm.0 */ CLKDEV_INIT("mcfeport.0", NULL, &__clk_0_37),
&__clk_0_37, /* mcfeport.0 */ CLKDEV_INIT("mcfwdt.0", NULL, &__clk_0_38),
&__clk_0_38, /* mcfwdt.0 */ CLKDEV_INIT(NULL, "sys.0", &__clk_0_40),
&__clk_0_40, /* sys.0 */ CLKDEV_INIT("gpio.0", NULL, &__clk_0_41),
&__clk_0_41, /* gpio.0 */ CLKDEV_INIT("mcfrtc.0", NULL, &__clk_0_42),
&__clk_0_42, /* mcfrtc.0 */ CLKDEV_INIT("mcflcd.0", NULL, &__clk_0_43),
&__clk_0_43, /* mcflcd.0 */ CLKDEV_INIT("mcfusb-otg.0", NULL, &__clk_0_44),
&__clk_0_44, /* mcfusb-otg.0 */ CLKDEV_INIT("mcfusb-host.0", NULL, &__clk_0_45),
&__clk_0_45, /* mcfusb-host.0 */ CLKDEV_INIT("sdram.0", NULL, &__clk_0_46),
&__clk_0_46, /* sdram.0 */ CLKDEV_INIT("ssi.0", NULL, &__clk_0_47),
&__clk_0_47, /* ssi.0 */ CLKDEV_INIT(NULL, "pll.0", &__clk_0_48),
&__clk_0_48, /* pll.0 */ CLKDEV_INIT("mdha.0", NULL, &__clk_1_32),
CLKDEV_INIT("skha.0", NULL, &__clk_1_33),
&__clk_1_32, /* mdha.0 */ CLKDEV_INIT("rng.0", NULL, &__clk_1_34),
&__clk_1_33, /* skha.0 */
&__clk_1_34, /* rng.0 */
NULL,
}; };
static struct clk * const enable_clks[] __initconst = { static struct clk * const enable_clks[] __initconst = {
...@@ -158,6 +156,8 @@ static void __init m53xx_clk_init(void) ...@@ -158,6 +156,8 @@ static void __init m53xx_clk_init(void)
/* make sure these clocks are disabled */ /* make sure these clocks are disabled */
for (i = 0; i < ARRAY_SIZE(disable_clks); ++i) for (i = 0; i < ARRAY_SIZE(disable_clks); ++i)
__clk_init_disabled(disable_clks[i]); __clk_init_disabled(disable_clks[i]);
clkdev_add_table(m53xx_clk_lookup, ARRAY_SIZE(m53xx_clk_lookup));
} }
/***************************************************************************/ /***************************************************************************/
......
arch/m68k/coldfire/m5407.c
View file @ 4c5519fa
...@@ -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/m5441x.c
View file @ 4c5519fa
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
* (C) Copyright Steven King <sfking@fdwdc.com> * (C) Copyright Steven King <sfking@fdwdc.com>
*/ */
#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>
...@@ -78,72 +79,67 @@ DEFINE_CLK(2, "ipg.0", 0, MCF_CLK); ...@@ -78,72 +79,67 @@ DEFINE_CLK(2, "ipg.0", 0, MCF_CLK);
DEFINE_CLK(2, "ahb.0", 1, MCF_CLK); DEFINE_CLK(2, "ahb.0", 1, MCF_CLK);
DEFINE_CLK(2, "per.0", 2, MCF_CLK); DEFINE_CLK(2, "per.0", 2, MCF_CLK);
struct clk *mcf_clks[] = { static struct clk_lookup m5411x_clk_lookup[] = {
&__clk_0_2, CLKDEV_INIT("flexbus", NULL, &__clk_0_2),
&__clk_0_8, CLKDEV_INIT("mcfcan.0", NULL, &__clk_0_8),
&__clk_0_9, CLKDEV_INIT("mcfcan.1", NULL, &__clk_0_9),
&__clk_0_14, CLKDEV_INIT("imx1-i2c.1", NULL, &__clk_0_14),
&__clk_0_15, CLKDEV_INIT("mcfdspi.1", NULL, &__clk_0_15),
&__clk_0_17, CLKDEV_INIT("edma", NULL, &__clk_0_17),
&__clk_0_18, CLKDEV_INIT("intc.0", NULL, &__clk_0_18),
&__clk_0_19, CLKDEV_INIT("intc.1", NULL, &__clk_0_19),
&__clk_0_20, CLKDEV_INIT("intc.2", NULL, &__clk_0_20),
&__clk_0_22, CLKDEV_INIT("imx1-i2c.0", NULL, &__clk_0_22),
&__clk_0_23, CLKDEV_INIT("fsl-dspi.0", NULL, &__clk_0_23),
&__clk_0_24, CLKDEV_INIT("mcfuart.0", NULL, &__clk_0_24),
&__clk_0_25, CLKDEV_INIT("mcfuart.1", NULL, &__clk_0_25),
&__clk_0_26, CLKDEV_INIT("mcfuart.2", NULL, &__clk_0_26),
&__clk_0_27, CLKDEV_INIT("mcfuart.3", NULL, &__clk_0_27),
&__clk_0_28, CLKDEV_INIT("mcftmr.0", NULL, &__clk_0_28),
&__clk_0_29, CLKDEV_INIT("mcftmr.1", NULL, &__clk_0_29),
&__clk_0_30, CLKDEV_INIT("mcftmr.2", NULL, &__clk_0_30),
&__clk_0_31, CLKDEV_INIT("mcftmr.3", NULL, &__clk_0_31),
&__clk_0_32, CLKDEV_INIT("mcfpit.0", NULL, &__clk_0_32),
&__clk_0_33, CLKDEV_INIT("mcfpit.1", NULL, &__clk_0_33),
&__clk_0_34, CLKDEV_INIT("mcfpit.2", NULL, &__clk_0_34),
&__clk_0_35, CLKDEV_INIT("mcfpit.3", NULL, &__clk_0_35),
&__clk_0_37, CLKDEV_INIT("mcfeport.0", NULL, &__clk_0_37),
&__clk_0_38, CLKDEV_INIT("mcfadc.0", NULL, &__clk_0_38),
&__clk_0_39, CLKDEV_INIT("mcfdac.0", NULL, &__clk_0_39),
&__clk_0_42, CLKDEV_INIT("mcfrtc.0", NULL, &__clk_0_42),
&__clk_0_43, CLKDEV_INIT("mcfsim.0", NULL, &__clk_0_43),
&__clk_0_44, CLKDEV_INIT("mcfusb-otg.0", NULL, &__clk_0_44),
&__clk_0_45, CLKDEV_INIT("mcfusb-host.0", NULL, &__clk_0_45),
&__clk_0_46, CLKDEV_INIT("mcfddr-sram.0", NULL, &__clk_0_46),
&__clk_0_47, CLKDEV_INIT("mcfssi.0", NULL, &__clk_0_47),
&__clk_0_48, CLKDEV_INIT(NULL, "pll.0", &__clk_0_48),
&__clk_0_49, CLKDEV_INIT("mcfrng.0", NULL, &__clk_0_49),
&__clk_0_50, CLKDEV_INIT("mcfssi.1", NULL, &__clk_0_50),
&__clk_0_51, CLKDEV_INIT("sdhci-esdhc-mcf.0", NULL, &__clk_0_51),
&__clk_0_53, CLKDEV_INIT("enet-fec.0", NULL, &__clk_0_53),
&__clk_0_54, CLKDEV_INIT("enet-fec.1", NULL, &__clk_0_54),
&__clk_0_55, CLKDEV_INIT("switch.0", NULL, &__clk_0_55),
&__clk_0_56, CLKDEV_INIT("switch.1", NULL, &__clk_0_56),
&__clk_0_63, CLKDEV_INIT("nand.0", NULL, &__clk_0_63),
CLKDEV_INIT("mcfow.0", NULL, &__clk_1_2),
&__clk_1_2, CLKDEV_INIT("imx1-i2c.2", NULL, &__clk_1_4),
&__clk_1_4, CLKDEV_INIT("imx1-i2c.3", NULL, &__clk_1_5),
&__clk_1_5, CLKDEV_INIT("imx1-i2c.4", NULL, &__clk_1_6),
&__clk_1_6, CLKDEV_INIT("imx1-i2c.5", NULL, &__clk_1_7),
&__clk_1_7, CLKDEV_INIT("mcfuart.4", NULL, &__clk_1_24),
&__clk_1_24, CLKDEV_INIT("mcfuart.5", NULL, &__clk_1_25),
&__clk_1_25, CLKDEV_INIT("mcfuart.6", NULL, &__clk_1_26),
&__clk_1_26, CLKDEV_INIT("mcfuart.7", NULL, &__clk_1_27),
&__clk_1_27, CLKDEV_INIT("mcfuart.8", NULL, &__clk_1_28),
&__clk_1_28, CLKDEV_INIT("mcfuart.9", NULL, &__clk_1_29),
&__clk_1_29, CLKDEV_INIT("mcfpwm.0", NULL, &__clk_1_34),
&__clk_1_34, CLKDEV_INIT(NULL, "sys.0", &__clk_1_36),
&__clk_1_36, CLKDEV_INIT("gpio.0", NULL, &__clk_1_37),
&__clk_1_37, CLKDEV_INIT("ipg.0", NULL, &__clk_2_0),
CLKDEV_INIT("ahb.0", NULL, &__clk_2_1),
&__clk_2_0, CLKDEV_INIT("per.0", NULL, &__clk_2_2),
&__clk_2_1,
&__clk_2_2,
NULL,
}; };
static struct clk * const enable_clks[] __initconst = { static struct clk * const enable_clks[] __initconst = {
/* make sure these clocks are enabled */ /* make sure these clocks are enabled */
&__clk_0_15, /* dspi.1 */ &__clk_0_15, /* dspi.1 */
...@@ -228,6 +224,8 @@ static void __init m5441x_clk_init(void) ...@@ -228,6 +224,8 @@ static void __init m5441x_clk_init(void)
/* make sure these clocks are disabled */ /* make sure these clocks are disabled */
for (i = 0; i < ARRAY_SIZE(disable_clks); ++i) for (i = 0; i < ARRAY_SIZE(disable_clks); ++i)
__clk_init_disabled(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) static void __init m5441x_uarts_init(void)
......
arch/m68k/coldfire/m54xx.c
View file @ 4c5519fa
...@@ -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));
} }
/***************************************************************************/ /***************************************************************************/
arch/m68k/include/asm/mcfclk.h
View file @ 4c5519fa
...@@ -15,15 +15,12 @@ struct clk_ops { ...@@ -15,15 +15,12 @@ struct clk_ops {
}; };
struct clk { struct clk {
const char *name;
struct clk_ops *clk_ops; struct clk_ops *clk_ops;
unsigned long rate; unsigned long rate;
unsigned long enabled; unsigned long enabled;
u8 slot; u8 slot;
}; };
extern struct clk *mcf_clks[];
#ifdef MCFPM_PPMCR0 #ifdef MCFPM_PPMCR0
extern struct clk_ops clk_ops0; extern struct clk_ops clk_ops0;
#ifdef MCFPM_PPMCR1 #ifdef MCFPM_PPMCR1
...@@ -34,7 +31,6 @@ extern struct clk_ops clk_ops2; ...@@ -34,7 +31,6 @@ extern struct clk_ops clk_ops2;
#define DEFINE_CLK(clk_bank, clk_name, clk_slot, clk_rate) \ #define DEFINE_CLK(clk_bank, clk_name, clk_slot, clk_rate) \
static struct clk __clk_##clk_bank##_##clk_slot = { \ static struct clk __clk_##clk_bank##_##clk_slot = { \
.name = clk_name, \
.clk_ops = &clk_ops##clk_bank, \ .clk_ops = &clk_ops##clk_bank, \
.rate = clk_rate, \ .rate = clk_rate, \
.slot = clk_slot, \ .slot = clk_slot, \
...@@ -45,7 +41,6 @@ void __clk_init_disabled(struct clk *); ...@@ -45,7 +41,6 @@ void __clk_init_disabled(struct clk *);
#else #else
#define DEFINE_CLK(clk_ref, clk_name, clk_rate) \ #define DEFINE_CLK(clk_ref, clk_name, clk_rate) \
static struct clk clk_##clk_ref = { \ static struct clk clk_##clk_ref = { \
.name = clk_name, \
.rate = clk_rate, \ .rate = clk_rate, \
} }
#endif /* MCFPM_PPMCR0 */ #endif /* MCFPM_PPMCR0 */
......
arch/mips/Kconfig
View file @ 4c5519fa
...@@ -201,6 +201,7 @@ config MIPS_ALCHEMY ...@@ -201,6 +201,7 @@ config MIPS_ALCHEMY
config AR7 config AR7
bool "Texas Instruments AR7" bool "Texas Instruments AR7"
select BOOT_ELF32 select BOOT_ELF32
select COMMON_CLK
select DMA_NONCOHERENT select DMA_NONCOHERENT
select CEVT_R4K select CEVT_R4K
select CSRC_R4K select CSRC_R4K
...@@ -215,7 +216,6 @@ config AR7 ...@@ -215,7 +216,6 @@ config AR7
select SYS_SUPPORTS_ZBOOT_UART16550 select SYS_SUPPORTS_ZBOOT_UART16550
select GPIOLIB select GPIOLIB
select VLYNQ select VLYNQ
select HAVE_LEGACY_CLK
help help
Support for the Texas Instruments AR7 System-on-a-Chip Support for the Texas Instruments AR7 System-on-a-Chip
family: TNETD7100, 7200 and 7300. family: TNETD7100, 7200 and 7300.
...@@ -332,7 +332,6 @@ config BCM63XX ...@@ -332,7 +332,6 @@ config BCM63XX
select SWAP_IO_SPACE select SWAP_IO_SPACE
select GPIOLIB select GPIOLIB
select MIPS_L1_CACHE_SHIFT_4 select MIPS_L1_CACHE_SHIFT_4
select CLKDEV_LOOKUP
select HAVE_LEGACY_CLK select HAVE_LEGACY_CLK
help help
Support for BCM63XX based boards Support for BCM63XX based boards
...@@ -446,7 +445,6 @@ config LANTIQ ...@@ -446,7 +445,6 @@ config LANTIQ
select GPIOLIB select GPIOLIB
select SWAP_IO_SPACE select SWAP_IO_SPACE
select BOOT_RAW select BOOT_RAW
select CLKDEV_LOOKUP
select HAVE_LEGACY_CLK select HAVE_LEGACY_CLK
select USE_OF select USE_OF
select PINCTRL select PINCTRL
...@@ -630,6 +628,7 @@ config MACH_NINTENDO64 ...@@ -630,6 +628,7 @@ config MACH_NINTENDO64
config RALINK config RALINK
bool "Ralink based machines" bool "Ralink based machines"
select CEVT_R4K select CEVT_R4K
select COMMON_CLK
select CSRC_R4K select CSRC_R4K
select BOOT_RAW select BOOT_RAW
select DMA_NONCOHERENT select DMA_NONCOHERENT
...@@ -642,7 +641,6 @@ config RALINK ...@@ -642,7 +641,6 @@ config RALINK
select SYS_SUPPORTS_MIPS16 select SYS_SUPPORTS_MIPS16
select SYS_SUPPORTS_ZBOOT select SYS_SUPPORTS_ZBOOT
select SYS_HAS_EARLY_PRINTK select SYS_HAS_EARLY_PRINTK
select CLKDEV_LOOKUP
select ARCH_HAS_RESET_CONTROLLER select ARCH_HAS_RESET_CONTROLLER
select RESET_CONTROLLER select RESET_CONTROLLER
......
arch/mips/ar7/clock.c
View file @ 4c5519fa
...@@ -13,7 +13,9 @@ ...@@ -13,7 +13,9 @@
#include <linux/gcd.h> #include <linux/gcd.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/clkdev.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/clk-provider.h>
#include <asm/addrspace.h> #include <asm/addrspace.h>
#include <asm/mach-ar7/ar7.h> #include <asm/mach-ar7/ar7.h>
...@@ -84,17 +86,17 @@ struct tnetd7200_clocks { ...@@ -84,17 +86,17 @@ struct tnetd7200_clocks {
struct tnetd7200_clock usb; struct tnetd7200_clock usb;
}; };
static struct clk bus_clk = { struct clk_rate {
u32 rate;
};
static struct clk_rate bus_clk = {
.rate = 125000000, .rate = 125000000,
}; };
static struct clk cpu_clk = { static struct clk_rate cpu_clk = {
.rate = 150000000, .rate = 150000000,
}; };
static struct clk dsp_clk;
static struct clk vbus_clk;
static void approximate(int base, int target, int *prediv, static void approximate(int base, int target, int *prediv,
int *postdiv, int *mul) int *postdiv, int *mul)
{ {
...@@ -240,6 +242,8 @@ static void __init tnetd7300_init_clocks(void) ...@@ -240,6 +242,8 @@ static void __init tnetd7300_init_clocks(void)
struct tnetd7300_clocks *clocks = struct tnetd7300_clocks *clocks =
ioremap(UR8_REGS_CLOCKS, ioremap(UR8_REGS_CLOCKS,
sizeof(struct tnetd7300_clocks)); sizeof(struct tnetd7300_clocks));
u32 dsp_clk;
struct clk *clk;
bus_clk.rate = tnetd7300_get_clock(BUS_PLL_SOURCE_SHIFT, bus_clk.rate = tnetd7300_get_clock(BUS_PLL_SOURCE_SHIFT,
&clocks->bus, bootcr, AR7_AFE_CLOCK); &clocks->bus, bootcr, AR7_AFE_CLOCK);
...@@ -250,12 +254,18 @@ static void __init tnetd7300_init_clocks(void) ...@@ -250,12 +254,18 @@ static void __init tnetd7300_init_clocks(void)
else else
cpu_clk.rate = bus_clk.rate; cpu_clk.rate = bus_clk.rate;
if (dsp_clk.rate == 250000000) dsp_clk = tnetd7300_dsp_clock();
if (dsp_clk == 250000000)
tnetd7300_set_clock(DSP_PLL_SOURCE_SHIFT, &clocks->dsp, tnetd7300_set_clock(DSP_PLL_SOURCE_SHIFT, &clocks->dsp,
bootcr, dsp_clk.rate); bootcr, dsp_clk);
iounmap(clocks); iounmap(clocks);
iounmap(bootcr); iounmap(bootcr);
clk = clk_register_fixed_rate(NULL, "cpu", NULL, 0, cpu_clk.rate);
clkdev_create(clk, "cpu", NULL);
clk = clk_register_fixed_rate(NULL, "dsp", NULL, 0, dsp_clk);
clkdev_create(clk, "dsp", NULL);
} }
static void tnetd7200_set_clock(int base, struct tnetd7200_clock *clock, static void tnetd7200_set_clock(int base, struct tnetd7200_clock *clock,
...@@ -327,6 +337,7 @@ static void __init tnetd7200_init_clocks(void) ...@@ -327,6 +337,7 @@ static void __init tnetd7200_init_clocks(void)
int cpu_base, cpu_mul, cpu_prediv, cpu_postdiv; int cpu_base, cpu_mul, cpu_prediv, cpu_postdiv;
int dsp_base, dsp_mul, dsp_prediv, dsp_postdiv; int dsp_base, dsp_mul, dsp_prediv, dsp_postdiv;
int usb_base, usb_mul, usb_prediv, usb_postdiv; int usb_base, usb_mul, usb_prediv, usb_postdiv;
struct clk *clk;
cpu_base = tnetd7200_get_clock_base(TNETD7200_CLOCK_ID_CPU, bootcr); cpu_base = tnetd7200_get_clock_base(TNETD7200_CLOCK_ID_CPU, bootcr);
dsp_base = tnetd7200_get_clock_base(TNETD7200_CLOCK_ID_DSP, bootcr); dsp_base = tnetd7200_get_clock_base(TNETD7200_CLOCK_ID_DSP, bootcr);
...@@ -395,100 +406,34 @@ static void __init tnetd7200_init_clocks(void) ...@@ -395,100 +406,34 @@ static void __init tnetd7200_init_clocks(void)
usb_prediv, usb_postdiv, -1, usb_mul, usb_prediv, usb_postdiv, -1, usb_mul,
TNETD7200_DEF_USB_CLK); TNETD7200_DEF_USB_CLK);
dsp_clk.rate = cpu_clk.rate;
iounmap(clocks); iounmap(clocks);
iounmap(bootcr); iounmap(bootcr);
}
/*
* Linux clock API
*/
int clk_enable(struct clk *clk)
{
return 0;
}
EXPORT_SYMBOL(clk_enable);
void clk_disable(struct clk *clk)
{
}
EXPORT_SYMBOL(clk_disable);
unsigned long clk_get_rate(struct clk *clk)
{
if (!clk)
return 0;
return clk->rate; clk = clk_register_fixed_rate(NULL, "cpu", NULL, 0, cpu_clk.rate);
} clkdev_create(clk, "cpu", NULL);
EXPORT_SYMBOL(clk_get_rate); clkdev_create(clk, "dsp", NULL);
struct clk *clk_get(struct device *dev, const char *id)
{
if (!strcmp(id, "bus"))
return &bus_clk;
/* cpmac and vbus share the same rate */
if (!strcmp(id, "cpmac"))
return &vbus_clk;
if (!strcmp(id, "cpu"))
return &cpu_clk;
if (!strcmp(id, "dsp"))
return &dsp_clk;
if (!strcmp(id, "vbus"))
return &vbus_clk;
return ERR_PTR(-ENOENT);
} }
EXPORT_SYMBOL(clk_get);
void clk_put(struct clk *clk)
{
}
EXPORT_SYMBOL(clk_put);
void __init ar7_init_clocks(void) void __init ar7_init_clocks(void)
{ {
struct clk *clk;
switch (ar7_chip_id()) { switch (ar7_chip_id()) {
case AR7_CHIP_7100: case AR7_CHIP_7100:
case AR7_CHIP_7200: case AR7_CHIP_7200:
tnetd7200_init_clocks(); tnetd7200_init_clocks();
break; break;
case AR7_CHIP_7300: case AR7_CHIP_7300:
dsp_clk.rate = tnetd7300_dsp_clock();
tnetd7300_init_clocks(); tnetd7300_init_clocks();
break; break;
default: default:
break; break;
} }
clk = clk_register_fixed_rate(NULL, "bus", NULL, 0, bus_clk.rate);
clkdev_create(clk, "bus", NULL);
/* adjust vbus clock rate */ /* adjust vbus clock rate */
vbus_clk.rate = bus_clk.rate / 2; clk = clk_register_fixed_factor(NULL, "vbus", "bus", 0, 1, 2);
} clkdev_create(clk, "vbus", NULL);
clkdev_create(clk, "cpmac", "cpmac.1");
/* dummy functions, should not be called */ clkdev_create(clk, "cpmac", "cpmac.1");
long clk_round_rate(struct clk *clk, unsigned long rate)
{
WARN_ON(clk);
return 0;
}
EXPORT_SYMBOL(clk_round_rate);
int clk_set_rate(struct clk *clk, unsigned long rate)
{
WARN_ON(clk);
return 0;
}
EXPORT_SYMBOL(clk_set_rate);
int clk_set_parent(struct clk *clk, struct clk *parent)
{
WARN_ON(clk);
return 0;
}
EXPORT_SYMBOL(clk_set_parent);
struct clk *clk_get_parent(struct clk *clk)
{
WARN_ON(clk);
return NULL;
} }
EXPORT_SYMBOL(clk_get_parent);
arch/mips/include/asm/mach-ar7/ar7.h
View file @ 4c5519fa
...@@ -131,10 +131,6 @@ static inline u8 ar7_chip_rev(void) ...@@ -131,10 +131,6 @@ static inline u8 ar7_chip_rev(void)
0x14))) >> 16) & 0xff; 0x14))) >> 16) & 0xff;
} }
struct clk {
unsigned int rate;
};
static inline int ar7_has_high_cpmac(void) static inline int ar7_has_high_cpmac(void)
{ {
u16 chip_id = ar7_chip_id(); u16 chip_id = ar7_chip_id();
......
arch/mips/pic32/Kconfig
View file @ 4c5519fa
...@@ -17,7 +17,6 @@ config PIC32MZDA ...@@ -17,7 +17,6 @@ config PIC32MZDA
select SYS_SUPPORTS_LITTLE_ENDIAN select SYS_SUPPORTS_LITTLE_ENDIAN
select GPIOLIB select GPIOLIB
select COMMON_CLK select COMMON_CLK
select CLKDEV_LOOKUP
select LIBFDT select LIBFDT
select USE_OF select USE_OF
select PINCTRL select PINCTRL
......
arch/mips/ralink/Kconfig
View file @ 4c5519fa
...@@ -28,22 +28,18 @@ choice ...@@ -28,22 +28,18 @@ choice
bool "RT288x" bool "RT288x"
select MIPS_AUTO_PFN_OFFSET select MIPS_AUTO_PFN_OFFSET
select MIPS_L1_CACHE_SHIFT_4 select MIPS_L1_CACHE_SHIFT_4
select HAVE_LEGACY_CLK
select HAVE_PCI select HAVE_PCI
config SOC_RT305X config SOC_RT305X
bool "RT305x" bool "RT305x"
select HAVE_LEGACY_CLK
config SOC_RT3883 config SOC_RT3883
bool "RT3883" bool "RT3883"
select HAVE_LEGACY_CLK
select HAVE_PCI select HAVE_PCI
config SOC_MT7620 config SOC_MT7620
bool "MT7620/8" bool "MT7620/8"
select CPU_MIPSR2_IRQ_VI select CPU_MIPSR2_IRQ_VI
select HAVE_LEGACY_CLK
select HAVE_PCI select HAVE_PCI
config SOC_MT7621 config SOC_MT7621
...@@ -54,7 +50,6 @@ choice ...@@ -54,7 +50,6 @@ choice
select SYS_SUPPORTS_MIPS_CPS select SYS_SUPPORTS_MIPS_CPS
select SYS_SUPPORTS_HIGHMEM select SYS_SUPPORTS_HIGHMEM
select MIPS_GIC select MIPS_GIC
select COMMON_CLK
select CLKSRC_MIPS_GIC select CLKSRC_MIPS_GIC
select HAVE_PCI if PCI_MT7621 select HAVE_PCI if PCI_MT7621
select SOC_BUS select SOC_BUS
......
arch/mips/ralink/clk.c
View file @ 4c5519fa
...@@ -10,79 +10,21 @@ ...@@ -10,79 +10,21 @@
#include <linux/export.h> #include <linux/export.h>
#include <linux/clkdev.h> #include <linux/clkdev.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/clk-provider.h>
#include <asm/time.h> #include <asm/time.h>
#include "common.h" #include "common.h"
struct clk {
struct clk_lookup cl;
unsigned long rate;
};
void ralink_clk_add(const char *dev, unsigned long rate) void ralink_clk_add(const char *dev, unsigned long rate)
{ {
struct clk *clk = kzalloc(sizeof(struct clk), GFP_KERNEL); struct clk *clk = clk_register_fixed_rate(NULL, dev, NULL, 0, rate);
if (!clk) if (!clk)
panic("failed to add clock"); panic("failed to add clock");
clk->cl.dev_id = dev; clkdev_create(clk, NULL, "%s", dev);
clk->cl.clk = clk;
clk->rate = rate;
clkdev_add(&clk->cl);
}
/*
* Linux clock API
*/
int clk_enable(struct clk *clk)
{
return 0;
}
EXPORT_SYMBOL_GPL(clk_enable);
void clk_disable(struct clk *clk)
{
}
EXPORT_SYMBOL_GPL(clk_disable);
unsigned long clk_get_rate(struct clk *clk)
{
if (!clk)
return 0;
return clk->rate;
}
EXPORT_SYMBOL_GPL(clk_get_rate);
int clk_set_rate(struct clk *clk, unsigned long rate)
{
return -1;
}
EXPORT_SYMBOL_GPL(clk_set_rate);
long clk_round_rate(struct clk *clk, unsigned long rate)
{
return -1;
}
EXPORT_SYMBOL_GPL(clk_round_rate);
int clk_set_parent(struct clk *clk, struct clk *parent)
{
WARN_ON(clk);
return -1;
}
EXPORT_SYMBOL_GPL(clk_set_parent);
struct clk *clk_get_parent(struct clk *clk)
{
WARN_ON(clk);
return NULL;
} }
EXPORT_SYMBOL_GPL(clk_get_parent);
void __init plat_time_init(void) void __init plat_time_init(void)
{ {
......
arch/sh/Kconfig
View file @ 4c5519fa
...@@ -14,7 +14,6 @@ config SUPERH ...@@ -14,7 +14,6 @@ config SUPERH
select ARCH_HIBERNATION_POSSIBLE if MMU select ARCH_HIBERNATION_POSSIBLE if MMU
select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_MIGHT_HAVE_PC_PARPORT
select ARCH_WANT_IPC_PARSE_VERSION select ARCH_WANT_IPC_PARSE_VERSION
select CLKDEV_LOOKUP
select CPU_NO_EFFICIENT_FFS select CPU_NO_EFFICIENT_FFS
select DMA_DECLARE_COHERENT select DMA_DECLARE_COHERENT
select GENERIC_ATOMIC64 select GENERIC_ATOMIC64
......
drivers/clk/Kconfig
View file @ 4c5519fa
...@@ -6,10 +6,6 @@ config HAVE_CLK ...@@ -6,10 +6,6 @@ config HAVE_CLK
The <linux/clk.h> calls support software clock gating and The <linux/clk.h> calls support software clock gating and
thus are a key power management tool on many systems. thus are a key power management tool on many systems.
config CLKDEV_LOOKUP
bool
select HAVE_CLK
config HAVE_CLK_PREPARE config HAVE_CLK_PREPARE
bool bool
...@@ -26,7 +22,7 @@ menuconfig COMMON_CLK ...@@ -26,7 +22,7 @@ menuconfig COMMON_CLK
bool "Common Clock Framework" bool "Common Clock Framework"
depends on !HAVE_LEGACY_CLK depends on !HAVE_LEGACY_CLK
select HAVE_CLK_PREPARE select HAVE_CLK_PREPARE
select CLKDEV_LOOKUP select HAVE_CLK
select SRCU select SRCU
select RATIONAL select RATIONAL
help help
......
drivers/clk/Makefile
View file @ 4c5519fa
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
# common clock types # common clock types
obj-$(CONFIG_HAVE_CLK) += clk-devres.o clk-bulk.o obj-$(CONFIG_HAVE_CLK) += clk-devres.o clk-bulk.o clkdev.o
obj-$(CONFIG_CLKDEV_LOOKUP) += clkdev.o
obj-$(CONFIG_COMMON_CLK) += clk.o obj-$(CONFIG_COMMON_CLK) += clk.o
obj-$(CONFIG_COMMON_CLK) += clk-divider.o obj-$(CONFIG_COMMON_CLK) += clk-divider.o
obj-$(CONFIG_COMMON_CLK) += clk-fixed-factor.o obj-$(CONFIG_COMMON_CLK) += clk-fixed-factor.o
......
drivers/clk/clkdev.c
View file @ 4c5519fa
...@@ -190,34 +190,6 @@ vclkdev_create(struct clk_hw *hw, const char *con_id, const char *dev_fmt, ...@@ -190,34 +190,6 @@ vclkdev_create(struct clk_hw *hw, const char *con_id, const char *dev_fmt,
return cl; return cl;
} }
struct clk_lookup * __ref
clkdev_alloc(struct clk *clk, const char *con_id, const char *dev_fmt, ...)
{
struct clk_lookup *cl;
va_list ap;
va_start(ap, dev_fmt);
cl = vclkdev_alloc(__clk_get_hw(clk), con_id, dev_fmt, ap);
va_end(ap);
return cl;
}
EXPORT_SYMBOL(clkdev_alloc);
struct clk_lookup *
clkdev_hw_alloc(struct clk_hw *hw, const char *con_id, const char *dev_fmt, ...)
{
struct clk_lookup *cl;
va_list ap;
va_start(ap, dev_fmt);
cl = vclkdev_alloc(hw, con_id, dev_fmt, ap);
va_end(ap);
return cl;
}
EXPORT_SYMBOL(clkdev_hw_alloc);
/** /**
* clkdev_create - allocate and add a clkdev lookup structure * clkdev_create - allocate and add a clkdev lookup structure
* @clk: struct clk to associate with all clk_lookups * @clk: struct clk to associate with all clk_lookups
......
drivers/clocksource/Kconfig
View file @ 4c5519fa
...@@ -360,7 +360,7 @@ config ARM_GLOBAL_TIMER ...@@ -360,7 +360,7 @@ config ARM_GLOBAL_TIMER
config ARM_TIMER_SP804 config ARM_TIMER_SP804
bool "Support for Dual Timer SP804 module" if COMPILE_TEST bool "Support for Dual Timer SP804 module" if COMPILE_TEST
depends on GENERIC_SCHED_CLOCK && CLKDEV_LOOKUP depends on GENERIC_SCHED_CLOCK && HAVE_CLK
select CLKSRC_MMIO select CLKSRC_MMIO
select TIMER_OF if OF select TIMER_OF if OF
...@@ -570,12 +570,12 @@ config H8300_TPU ...@@ -570,12 +570,12 @@ config H8300_TPU
config CLKSRC_IMX_GPT config CLKSRC_IMX_GPT
bool "Clocksource using i.MX GPT" if COMPILE_TEST bool "Clocksource using i.MX GPT" if COMPILE_TEST
depends on (ARM || ARM64) && CLKDEV_LOOKUP depends on (ARM || ARM64) && HAVE_CLK
select CLKSRC_MMIO select CLKSRC_MMIO
config CLKSRC_IMX_TPM config CLKSRC_IMX_TPM
bool "Clocksource using i.MX TPM" if COMPILE_TEST bool "Clocksource using i.MX TPM" if COMPILE_TEST
depends on (ARM || ARM64) && CLKDEV_LOOKUP depends on (ARM || ARM64) && HAVE_CLK
select CLKSRC_MMIO select CLKSRC_MMIO
select TIMER_OF select TIMER_OF
help help
......
drivers/mmc/host/Kconfig
View file @ 4c5519fa
...@@ -329,7 +329,7 @@ config MMC_SDHCI_S3C ...@@ -329,7 +329,7 @@ config MMC_SDHCI_S3C
config MMC_SDHCI_PXAV3 config MMC_SDHCI_PXAV3
tristate "Marvell MMP2 SD Host Controller support (PXAV3)" tristate "Marvell MMP2 SD Host Controller support (PXAV3)"
depends on CLKDEV_LOOKUP depends on HAVE_CLK
depends on MMC_SDHCI_PLTFM depends on MMC_SDHCI_PLTFM
depends on ARCH_BERLIN || ARCH_MMP || ARCH_MVEBU || COMPILE_TEST depends on ARCH_BERLIN || ARCH_MMP || ARCH_MVEBU || COMPILE_TEST
default CPU_MMP2 default CPU_MMP2
...@@ -342,7 +342,7 @@ config MMC_SDHCI_PXAV3 ...@@ -342,7 +342,7 @@ config MMC_SDHCI_PXAV3
config MMC_SDHCI_PXAV2 config MMC_SDHCI_PXAV2
tristate "Marvell PXA9XX SD Host Controller support (PXAV2)" tristate "Marvell PXA9XX SD Host Controller support (PXAV2)"
depends on CLKDEV_LOOKUP depends on HAVE_CLK
depends on MMC_SDHCI_PLTFM depends on MMC_SDHCI_PLTFM
depends on ARCH_MMP || COMPILE_TEST depends on ARCH_MMP || COMPILE_TEST
default CPU_PXA910 default CPU_PXA910
......
drivers/staging/board/Kconfig
View file @ 4c5519fa
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
config STAGING_BOARD config STAGING_BOARD
bool "Staging Board Support" bool "Staging Board Support"
depends on OF_ADDRESS && OF_IRQ && CLKDEV_LOOKUP depends on OF_ADDRESS && OF_IRQ && HAVE_CLK
help help
Staging board base is to support continuous upstream Staging board base is to support continuous upstream
in-tree development and integration of platform devices. in-tree development and integration of platform devices.
......
include/linux/clkdev.h
View file @ 4c5519fa
...@@ -30,11 +30,6 @@ struct clk_lookup { ...@@ -30,11 +30,6 @@ struct clk_lookup {
.clk = c, \ .clk = c, \
} }
struct clk_lookup *clkdev_alloc(struct clk *clk, const char *con_id,
const char *dev_fmt, ...) __printf(3, 4);
struct clk_lookup *clkdev_hw_alloc(struct clk_hw *hw, const char *con_id,
const char *dev_fmt, ...) __printf(3, 4);
void clkdev_add(struct clk_lookup *cl); void clkdev_add(struct clk_lookup *cl);
void clkdev_drop(struct clk_lookup *cl); void clkdev_drop(struct clk_lookup *cl);
......
sound/soc/dwc/Kconfig
View file @ 4c5519fa
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
config SND_DESIGNWARE_I2S config SND_DESIGNWARE_I2S
tristate "Synopsys I2S Device Driver" tristate "Synopsys I2S Device Driver"
depends on CLKDEV_LOOKUP depends on HAVE_CLK
select SND_SOC_GENERIC_DMAENGINE_PCM select SND_SOC_GENERIC_DMAENGINE_PCM
help help
Say Y or M if you want to add support for I2S driver for Say Y or M if you want to add support for I2S driver for
......
sound/soc/rockchip/Kconfig
View file @ 4c5519fa
...@@ -9,7 +9,7 @@ config SND_SOC_ROCKCHIP ...@@ -9,7 +9,7 @@ config SND_SOC_ROCKCHIP
config SND_SOC_ROCKCHIP_I2S config SND_SOC_ROCKCHIP_I2S
tristate "Rockchip I2S Device Driver" tristate "Rockchip I2S Device Driver"
depends on CLKDEV_LOOKUP && SND_SOC_ROCKCHIP depends on HAVE_CLK && SND_SOC_ROCKCHIP
select SND_SOC_GENERIC_DMAENGINE_PCM select SND_SOC_GENERIC_DMAENGINE_PCM
help help
Say Y or M if you want to add support for I2S driver for Say Y or M if you want to add support for I2S driver for
...@@ -18,7 +18,7 @@ config SND_SOC_ROCKCHIP_I2S ...@@ -18,7 +18,7 @@ config SND_SOC_ROCKCHIP_I2S
config SND_SOC_ROCKCHIP_PDM config SND_SOC_ROCKCHIP_PDM
tristate "Rockchip PDM Controller Driver" tristate "Rockchip PDM Controller Driver"
depends on CLKDEV_LOOKUP && SND_SOC_ROCKCHIP depends on HAVE_CLK && SND_SOC_ROCKCHIP
select SND_SOC_GENERIC_DMAENGINE_PCM select SND_SOC_GENERIC_DMAENGINE_PCM
select RATIONAL select RATIONAL
help help
...@@ -28,7 +28,7 @@ config SND_SOC_ROCKCHIP_PDM ...@@ -28,7 +28,7 @@ config SND_SOC_ROCKCHIP_PDM
config SND_SOC_ROCKCHIP_SPDIF config SND_SOC_ROCKCHIP_SPDIF
tristate "Rockchip SPDIF Device Driver" tristate "Rockchip SPDIF Device Driver"
depends on CLKDEV_LOOKUP && SND_SOC_ROCKCHIP depends on HAVE_CLK && SND_SOC_ROCKCHIP
select SND_SOC_GENERIC_DMAENGINE_PCM select SND_SOC_GENERIC_DMAENGINE_PCM
help help
Say Y or M if you want to add support for SPDIF driver for Say Y or M if you want to add support for SPDIF driver for
...@@ -36,7 +36,7 @@ config SND_SOC_ROCKCHIP_SPDIF ...@@ -36,7 +36,7 @@ config SND_SOC_ROCKCHIP_SPDIF
config SND_SOC_ROCKCHIP_MAX98090 config SND_SOC_ROCKCHIP_MAX98090
tristate "ASoC support for Rockchip boards using a MAX98090 codec" tristate "ASoC support for Rockchip boards using a MAX98090 codec"
depends on SND_SOC_ROCKCHIP && I2C && GPIOLIB && CLKDEV_LOOKUP depends on SND_SOC_ROCKCHIP && I2C && GPIOLIB && HAVE_CLK
select SND_SOC_ROCKCHIP_I2S select SND_SOC_ROCKCHIP_I2S
select SND_SOC_MAX98090 select SND_SOC_MAX98090
select SND_SOC_TS3A227E select SND_SOC_TS3A227E
...@@ -47,7 +47,7 @@ config SND_SOC_ROCKCHIP_MAX98090 ...@@ -47,7 +47,7 @@ config SND_SOC_ROCKCHIP_MAX98090
config SND_SOC_ROCKCHIP_RT5645 config SND_SOC_ROCKCHIP_RT5645
tristate "ASoC support for Rockchip boards using a RT5645/RT5650 codec" tristate "ASoC support for Rockchip boards using a RT5645/RT5650 codec"
depends on SND_SOC_ROCKCHIP && I2C && GPIOLIB && CLKDEV_LOOKUP depends on SND_SOC_ROCKCHIP && I2C && GPIOLIB && HAVE_CLK
select SND_SOC_ROCKCHIP_I2S select SND_SOC_ROCKCHIP_I2S
select SND_SOC_RT5645 select SND_SOC_RT5645
help help
...@@ -56,7 +56,7 @@ config SND_SOC_ROCKCHIP_RT5645 ...@@ -56,7 +56,7 @@ config SND_SOC_ROCKCHIP_RT5645
config SND_SOC_RK3288_HDMI_ANALOG config SND_SOC_RK3288_HDMI_ANALOG
tristate "ASoC support multiple codecs for Rockchip RK3288 boards" tristate "ASoC support multiple codecs for Rockchip RK3288 boards"
depends on SND_SOC_ROCKCHIP && I2C && GPIOLIB && CLKDEV_LOOKUP depends on SND_SOC_ROCKCHIP && I2C && GPIOLIB && HAVE_CLK
select SND_SOC_ROCKCHIP_I2S select SND_SOC_ROCKCHIP_I2S
select SND_SOC_HDMI_CODEC select SND_SOC_HDMI_CODEC
select SND_SOC_ES8328_I2C select SND_SOC_ES8328_I2C
...@@ -68,7 +68,7 @@ config SND_SOC_RK3288_HDMI_ANALOG ...@@ -68,7 +68,7 @@ config SND_SOC_RK3288_HDMI_ANALOG
config SND_SOC_RK3399_GRU_SOUND config SND_SOC_RK3399_GRU_SOUND
tristate "ASoC support multiple codecs for Rockchip RK3399 GRU boards" tristate "ASoC support multiple codecs for Rockchip RK3399 GRU boards"
depends on SND_SOC_ROCKCHIP && I2C && GPIOLIB && CLKDEV_LOOKUP && SPI depends on SND_SOC_ROCKCHIP && I2C && GPIOLIB && HAVE_CLK && SPI
select SND_SOC_ROCKCHIP_I2S select SND_SOC_ROCKCHIP_I2S
select SND_SOC_MAX98357A select SND_SOC_MAX98357A
select SND_SOC_RT5514 select SND_SOC_RT5514
......
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