Skip to content

Commit 4c5519f

Browse files
bebarinobebarino
committed
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: Arnd 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
2 parents 6efb943 + 5617c91 commit 4c5519f

32 files changed

Lines changed: 318 additions & 568 deletions

File tree

‎arch/arm/Kconfig‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,6 @@ config ARCH_EP93XX
353353
select ARM_VIC
354354
select GENERIC_IRQ_MULTI_HANDLER
355355
select AUTO_ZRELADDR
356-
select CLKDEV_LOOKUP
357356
select CLKSRC_MMIO
358357
select CPU_ARM920T
359358
select GPIOLIB
@@ -504,7 +503,6 @@ config ARCH_OMAP1
504503
bool "TI OMAP1"
505504
depends on MMU
506505
select ARCH_OMAP
507-
select CLKDEV_LOOKUP
508506
select CLKSRC_MMIO
509507
select GENERIC_IRQ_CHIP
510508
select GENERIC_IRQ_MULTI_HANDLER

‎arch/m68k/coldfire/clk.c‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -73,20 +73,6 @@ struct clk_ops clk_ops1 = {
7373
#endif /* MCFPM_PPMCR1 */
7474
#endif /* MCFPM_PPMCR0 */
7575

76-
struct clk *clk_get(struct device *dev, const char *id)
77-
{
78-
const char *clk_name = dev ? dev_name(dev) : id ? id : NULL;
79-
struct clk *clk;
80-
unsigned i;
81-
82-
for (i = 0; (clk = mcf_clks[i]) != NULL; ++i)
83-
if (!strcmp(clk->name, clk_name))
84-
return clk;
85-
pr_warn("clk_get: didn't find clock %s\n", clk_name);
86-
return ERR_PTR(-ENOENT);
87-
}
88-
EXPORT_SYMBOL(clk_get);
89-
9076
int clk_enable(struct clk *clk)
9177
{
9278
unsigned long flags;
@@ -117,13 +103,6 @@ void clk_disable(struct clk *clk)
117103
}
118104
EXPORT_SYMBOL(clk_disable);
119105

120-
void clk_put(struct clk *clk)
121-
{
122-
if (clk->enabled != 0)
123-
pr_warn("clk_put %s still enabled\n", clk->name);
124-
}
125-
EXPORT_SYMBOL(clk_put);
126-
127106
unsigned long clk_get_rate(struct clk *clk)
128107
{
129108
if (!clk)

‎arch/m68k/coldfire/m5206.c‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
/***************************************************************************/
1212

13+
#include <linux/clkdev.h>
1314
#include <linux/kernel.h>
1415
#include <linux/param.h>
1516
#include <linux/init.h>
@@ -23,21 +24,15 @@
2324

2425
DEFINE_CLK(pll, "pll.0", MCF_CLK);
2526
DEFINE_CLK(sys, "sys.0", MCF_BUSCLK);
26-
DEFINE_CLK(mcftmr0, "mcftmr.0", MCF_BUSCLK);
27-
DEFINE_CLK(mcftmr1, "mcftmr.1", MCF_BUSCLK);
28-
DEFINE_CLK(mcfuart0, "mcfuart.0", MCF_BUSCLK);
29-
DEFINE_CLK(mcfuart1, "mcfuart.1", MCF_BUSCLK);
30-
DEFINE_CLK(mcfi2c0, "imx1-i2c.0", MCF_BUSCLK);
3127

32-
struct clk *mcf_clks[] = {
33-
&clk_pll,
34-
&clk_sys,
35-
&clk_mcftmr0,
36-
&clk_mcftmr1,
37-
&clk_mcfuart0,
38-
&clk_mcfuart1,
39-
&clk_mcfi2c0,
40-
NULL
28+
static struct clk_lookup m5206_clk_lookup[] = {
29+
CLKDEV_INIT(NULL, "pll.0", &clk_pll),
30+
CLKDEV_INIT(NULL, "sys.0", &clk_sys),
31+
CLKDEV_INIT("mcftmr.0", NULL, &clk_sys),
32+
CLKDEV_INIT("mcftmr.1", NULL, &clk_sys),
33+
CLKDEV_INIT("mcfuart.0", NULL, &clk_sys),
34+
CLKDEV_INIT("mcfuart.1", NULL, &clk_sys),
35+
CLKDEV_INIT("imx1-i2c.0", NULL, &clk_sys),
4136
};
4237

4338
/***************************************************************************/
@@ -66,6 +61,8 @@ void __init config_BSP(char *commandp, int size)
6661
mcf_mapirq2imr(28, MCFINTC_EINT4);
6762
mcf_mapirq2imr(31, MCFINTC_EINT7);
6863
m5206_i2c_init();
64+
65+
clkdev_add_table(m5206_clk_lookup, ARRAY_SIZE(m5206_clk_lookup));
6966
}
7067

7168
/***************************************************************************/

‎arch/m68k/coldfire/m520x.c‎

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
/***************************************************************************/
1414

15+
#include <linux/clkdev.h>
1516
#include <linux/kernel.h>
1617
#include <linux/param.h>
1718
#include <linux/init.h>
@@ -48,31 +49,29 @@ DEFINE_CLK(0, "sys.0", 40, MCF_BUSCLK);
4849
DEFINE_CLK(0, "gpio.0", 41, MCF_BUSCLK);
4950
DEFINE_CLK(0, "sdram.0", 42, MCF_CLK);
5051

51-
struct clk *mcf_clks[] = {
52-
&__clk_0_2, /* flexbus */
53-
&__clk_0_12, /* fec.0 */
54-
&__clk_0_17, /* edma */
55-
&__clk_0_18, /* intc.0 */
56-
&__clk_0_21, /* iack.0 */
57-
&__clk_0_22, /* imx1-i2c.0 */
58-
&__clk_0_23, /* mcfqspi.0 */
59-
&__clk_0_24, /* mcfuart.0 */
60-
&__clk_0_25, /* mcfuart.1 */
61-
&__clk_0_26, /* mcfuart.2 */
62-
&__clk_0_28, /* mcftmr.0 */
63-
&__clk_0_29, /* mcftmr.1 */
64-
&__clk_0_30, /* mcftmr.2 */
65-
&__clk_0_31, /* mcftmr.3 */
66-
67-
&__clk_0_32, /* mcfpit.0 */
68-
&__clk_0_33, /* mcfpit.1 */
69-
&__clk_0_34, /* mcfeport.0 */
70-
&__clk_0_35, /* mcfwdt.0 */
71-
&__clk_0_36, /* pll.0 */
72-
&__clk_0_40, /* sys.0 */
73-
&__clk_0_41, /* gpio.0 */
74-
&__clk_0_42, /* sdram.0 */
75-
NULL,
52+
static struct clk_lookup m520x_clk_lookup[] = {
53+
CLKDEV_INIT(NULL, "flexbus", &__clk_0_2),
54+
CLKDEV_INIT("fec.0", NULL, &__clk_0_12),
55+
CLKDEV_INIT("edma", NULL, &__clk_0_17),
56+
CLKDEV_INIT("intc.0", NULL, &__clk_0_18),
57+
CLKDEV_INIT("iack.0", NULL, &__clk_0_21),
58+
CLKDEV_INIT("imx1-i2c.0", NULL, &__clk_0_22),
59+
CLKDEV_INIT("mcfqspi.0", NULL, &__clk_0_23),
60+
CLKDEV_INIT("mcfuart.0", NULL, &__clk_0_24),
61+
CLKDEV_INIT("mcfuart.1", NULL, &__clk_0_25),
62+
CLKDEV_INIT("mcfuart.2", NULL, &__clk_0_26),
63+
CLKDEV_INIT("mcftmr.0", NULL, &__clk_0_28),
64+
CLKDEV_INIT("mcftmr.1", NULL, &__clk_0_29),
65+
CLKDEV_INIT("mcftmr.2", NULL, &__clk_0_30),
66+
CLKDEV_INIT("mcftmr.3", NULL, &__clk_0_31),
67+
CLKDEV_INIT("mcfpit.0", NULL, &__clk_0_32),
68+
CLKDEV_INIT("mcfpit.1", NULL, &__clk_0_33),
69+
CLKDEV_INIT("mcfeport.0", NULL, &__clk_0_34),
70+
CLKDEV_INIT("mcfwdt.0", NULL, &__clk_0_35),
71+
CLKDEV_INIT(NULL, "pll.0", &__clk_0_36),
72+
CLKDEV_INIT(NULL, "sys.0", &__clk_0_40),
73+
CLKDEV_INIT("gpio.0", NULL, &__clk_0_41),
74+
CLKDEV_INIT("sdram.0", NULL, &__clk_0_42),
7675
};
7776

7877
static struct clk * const enable_clks[] __initconst = {
@@ -115,6 +114,8 @@ static void __init m520x_clk_init(void)
115114
/* make sure these clocks are disabled */
116115
for (i = 0; i < ARRAY_SIZE(disable_clks); ++i)
117116
__clk_init_disabled(disable_clks[i]);
117+
118+
clkdev_add_table(m520x_clk_lookup, ARRAY_SIZE(m520x_clk_lookup));
118119
}
119120

120121
/***************************************************************************/

‎arch/m68k/coldfire/m523x.c‎

Lines changed: 17 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
/***************************************************************************/
1515

16+
#include <linux/clkdev.h>
1617
#include <linux/kernel.h>
1718
#include <linux/param.h>
1819
#include <linux/init.h>
@@ -26,31 +27,20 @@
2627

2728
DEFINE_CLK(pll, "pll.0", MCF_CLK);
2829
DEFINE_CLK(sys, "sys.0", MCF_BUSCLK);
29-
DEFINE_CLK(mcfpit0, "mcfpit.0", MCF_CLK);
30-
DEFINE_CLK(mcfpit1, "mcfpit.1", MCF_CLK);
31-
DEFINE_CLK(mcfpit2, "mcfpit.2", MCF_CLK);
32-
DEFINE_CLK(mcfpit3, "mcfpit.3", MCF_CLK);
33-
DEFINE_CLK(mcfuart0, "mcfuart.0", MCF_BUSCLK);
34-
DEFINE_CLK(mcfuart1, "mcfuart.1", MCF_BUSCLK);
35-
DEFINE_CLK(mcfuart2, "mcfuart.2", MCF_BUSCLK);
36-
DEFINE_CLK(mcfqspi0, "mcfqspi.0", MCF_BUSCLK);
37-
DEFINE_CLK(fec0, "fec.0", MCF_BUSCLK);
38-
DEFINE_CLK(mcfi2c0, "imx1-i2c.0", MCF_BUSCLK);
39-
40-
struct clk *mcf_clks[] = {
41-
&clk_pll,
42-
&clk_sys,
43-
&clk_mcfpit0,
44-
&clk_mcfpit1,
45-
&clk_mcfpit2,
46-
&clk_mcfpit3,
47-
&clk_mcfuart0,
48-
&clk_mcfuart1,
49-
&clk_mcfuart2,
50-
&clk_mcfqspi0,
51-
&clk_fec0,
52-
&clk_mcfi2c0,
53-
NULL
30+
31+
struct clk_lookup m523x_clk_lookup[] = {
32+
CLKDEV_INIT(NULL, "pll.0", &clk_pll),
33+
CLKDEV_INIT(NULL, "sys.0", &clk_sys),
34+
CLKDEV_INIT("mcfpit.0", NULL, &clk_pll),
35+
CLKDEV_INIT("mcfpit.1", NULL, &clk_pll),
36+
CLKDEV_INIT("mcfpit.2", NULL, &clk_pll),
37+
CLKDEV_INIT("mcfpit.3", NULL, &clk_pll),
38+
CLKDEV_INIT("mcfuart.0", NULL, &clk_sys),
39+
CLKDEV_INIT("mcfuart.1", NULL, &clk_sys),
40+
CLKDEV_INIT("mcfuart.2", NULL, &clk_sys),
41+
CLKDEV_INIT("mcfqspi.0", NULL, &clk_sys),
42+
CLKDEV_INIT("fec.0", NULL, &clk_sys),
43+
CLKDEV_INIT("imx1-i2c.0", NULL, &clk_sys),
5444
};
5545

5646
/***************************************************************************/
@@ -100,6 +90,8 @@ void __init config_BSP(char *commandp, int size)
10090
m523x_fec_init();
10191
m523x_qspi_init();
10292
m523x_i2c_init();
93+
94+
clkdev_add_table(m523x_clk_lookup, ARRAY_SIZE(m523x_clk_lookup));
10395
}
10496

10597
/***************************************************************************/

‎arch/m68k/coldfire/m5249.c‎

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
/***************************************************************************/
1111

12+
#include <linux/clkdev.h>
1213
#include <linux/kernel.h>
1314
#include <linux/param.h>
1415
#include <linux/init.h>
@@ -23,25 +24,17 @@
2324

2425
DEFINE_CLK(pll, "pll.0", MCF_CLK);
2526
DEFINE_CLK(sys, "sys.0", MCF_BUSCLK);
26-
DEFINE_CLK(mcftmr0, "mcftmr.0", MCF_BUSCLK);
27-
DEFINE_CLK(mcftmr1, "mcftmr.1", MCF_BUSCLK);
28-
DEFINE_CLK(mcfuart0, "mcfuart.0", MCF_BUSCLK);
29-
DEFINE_CLK(mcfuart1, "mcfuart.1", MCF_BUSCLK);
30-
DEFINE_CLK(mcfqspi0, "mcfqspi.0", MCF_BUSCLK);
31-
DEFINE_CLK(mcfi2c0, "imx1-i2c.0", MCF_BUSCLK);
32-
DEFINE_CLK(mcfi2c1, "imx1-i2c.1", MCF_BUSCLK);
33-
34-
struct clk *mcf_clks[] = {
35-
&clk_pll,
36-
&clk_sys,
37-
&clk_mcftmr0,
38-
&clk_mcftmr1,
39-
&clk_mcfuart0,
40-
&clk_mcfuart1,
41-
&clk_mcfqspi0,
42-
&clk_mcfi2c0,
43-
&clk_mcfi2c1,
44-
NULL
27+
28+
struct clk_lookup m5249_clk_lookup[] = {
29+
CLKDEV_INIT(NULL, "pll.0", &clk_pll),
30+
CLKDEV_INIT(NULL, "sys.0", &clk_sys),
31+
CLKDEV_INIT("mcftmr.0", NULL, &clk_sys),
32+
CLKDEV_INIT("mcftmr.1", NULL, &clk_sys),
33+
CLKDEV_INIT("mcfuart.0", NULL, &clk_sys),
34+
CLKDEV_INIT("mcfuart.1", NULL, &clk_sys),
35+
CLKDEV_INIT("mcfqspi.0", NULL, &clk_sys),
36+
CLKDEV_INIT("imx1-i2c.0", NULL, &clk_sys),
37+
CLKDEV_INIT("imx1-i2c.1", NULL, &clk_sys),
4538
};
4639

4740
/***************************************************************************/
@@ -137,6 +130,8 @@ void __init config_BSP(char *commandp, int size)
137130
#endif
138131
m5249_qspi_init();
139132
m5249_i2c_init();
133+
134+
clkdev_add_table(m5249_clk_lookup, ARRAY_SIZE(m5249_clk_lookup));
140135
}
141136

142137
/***************************************************************************/

‎arch/m68k/coldfire/m525x.c‎

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
/***************************************************************************/
1111

12+
#include <linux/clkdev.h>
1213
#include <linux/kernel.h>
1314
#include <linux/param.h>
1415
#include <linux/init.h>
@@ -23,25 +24,17 @@
2324

2425
DEFINE_CLK(pll, "pll.0", MCF_CLK);
2526
DEFINE_CLK(sys, "sys.0", MCF_BUSCLK);
26-
DEFINE_CLK(mcftmr0, "mcftmr.0", MCF_BUSCLK);
27-
DEFINE_CLK(mcftmr1, "mcftmr.1", MCF_BUSCLK);
28-
DEFINE_CLK(mcfuart0, "mcfuart.0", MCF_BUSCLK);
29-
DEFINE_CLK(mcfuart1, "mcfuart.1", MCF_BUSCLK);
30-
DEFINE_CLK(mcfqspi0, "mcfqspi.0", MCF_BUSCLK);
31-
DEFINE_CLK(mcfi2c0, "imx1-i2c.0", MCF_BUSCLK);
32-
DEFINE_CLK(mcfi2c1, "imx1-i2c.1", MCF_BUSCLK);
33-
34-
struct clk *mcf_clks[] = {
35-
&clk_pll,
36-
&clk_sys,
37-
&clk_mcftmr0,
38-
&clk_mcftmr1,
39-
&clk_mcfuart0,
40-
&clk_mcfuart1,
41-
&clk_mcfqspi0,
42-
&clk_mcfi2c0,
43-
&clk_mcfi2c1,
44-
NULL
27+
28+
static struct clk_lookup m525x_clk_lookup[] = {
29+
CLKDEV_INIT(NULL, "pll.0", &pll),
30+
CLKDEV_INIT(NULL, "sys.0", &clk_sys),
31+
CLKDEV_INIT("mcftmr.0", NULL, &clk_sys),
32+
CLKDEV_INIT("mcftmr.1", NULL, &clk_sys),
33+
CLKDEV_INIT("mcfuart.0", NULL, &clk_sys),
34+
CLKDEV_INIT("mcfuart.1", NULL, &clk_sys),
35+
CLKDEV_INIT("mcfqspi.0", NULL, &clk_sys),
36+
CLKDEV_INIT("imx1-i2c.0", NULL, &clk_sys),
37+
CLKDEV_INIT("imx1-i2c.1", NULL, &clk_sys),
4538
};
4639

4740
/***************************************************************************/
@@ -88,6 +81,8 @@ void __init config_BSP(char *commandp, int size)
8881

8982
m525x_qspi_init();
9083
m525x_i2c_init();
84+
85+
clkdev_add_table(m525x_clk_lookup, ARRAY_SIZE(m525x_clk_lookup));
9186
}
9287

9388
/***************************************************************************/

‎arch/m68k/coldfire/m5272.c‎

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
/***************************************************************************/
1212

13+
#include <linux/clkdev.h>
1314
#include <linux/kernel.h>
1415
#include <linux/param.h>
1516
#include <linux/init.h>
@@ -34,27 +35,18 @@ unsigned char ledbank = 0xff;
3435

3536
DEFINE_CLK(pll, "pll.0", MCF_CLK);
3637
DEFINE_CLK(sys, "sys.0", MCF_BUSCLK);
37-
DEFINE_CLK(mcftmr0, "mcftmr.0", MCF_BUSCLK);
38-
DEFINE_CLK(mcftmr1, "mcftmr.1", MCF_BUSCLK);
39-
DEFINE_CLK(mcftmr2, "mcftmr.2", MCF_BUSCLK);
40-
DEFINE_CLK(mcftmr3, "mcftmr.3", MCF_BUSCLK);
41-
DEFINE_CLK(mcfuart0, "mcfuart.0", MCF_BUSCLK);
42-
DEFINE_CLK(mcfuart1, "mcfuart.1", MCF_BUSCLK);
43-
DEFINE_CLK(mcfqspi0, "mcfqspi.0", MCF_BUSCLK);
44-
DEFINE_CLK(fec0, "fec.0", MCF_BUSCLK);
45-
46-
struct clk *mcf_clks[] = {
47-
&clk_pll,
48-
&clk_sys,
49-
&clk_mcftmr0,
50-
&clk_mcftmr1,
51-
&clk_mcftmr2,
52-
&clk_mcftmr3,
53-
&clk_mcfuart0,
54-
&clk_mcfuart1,
55-
&clk_mcfqspi0,
56-
&clk_fec0,
57-
NULL
38+
39+
static struct clk_lookup m5272_clk_lookup[] = {
40+
CLKDEV_INIT(NULL, "pll.0", &clk_pll),
41+
CLKDEV_INIT(NULL, "sys.0", &clk_sys),
42+
CLKDEV_INIT("mcftmr.0", NULL, &clk_sys),
43+
CLKDEV_INIT("mcftmr.1", NULL, &clk_sys),
44+
CLKDEV_INIT("mcftmr.2", NULL, &clk_sys),
45+
CLKDEV_INIT("mcftmr.3", NULL, &clk_sys),
46+
CLKDEV_INIT("mcfuart.0", NULL, &clk_sys),
47+
CLKDEV_INIT("mcfuart.1", NULL, &clk_sys),
48+
CLKDEV_INIT("mcfqspi.0", NULL, &clk_sys),
49+
CLKDEV_INIT("fec.0", NULL, &clk_sys),
5850
};
5951

6052
/***************************************************************************/
@@ -128,6 +120,7 @@ static int __init init_BSP(void)
128120
{
129121
m5272_uarts_init();
130122
fixed_phy_add(PHY_POLL, 0, &nettel_fixed_phy_status);
123+
clkdev_add_table(m5272_clk_lookup, ARRAY_SIZE(m5272_clk_lookup));
131124
return 0;
132125
}
133126

0 commit comments

Comments
 (0)