Skip to content

Commit 42ed83f

Browse files
author
Michael Turquette
committed
arm: omap2+ remove dead clock code
Remove omap_clocks_register and dummy_ck. The former is not used anymore now that the statically defined clk stuctures are replaced with proper descriptors and registered with the framework. The dummy clock in arch/arm/mach-omap2 is made redundant by the OMAP3+ clock data that migrated to drivers/clk. An additional benefit to this clean-up is removing the references to clk-private.h which will be removed. Cc: Paul Walmsley <[email protected]> Cc: Tero Kristo <[email protected]> Acked-by: Tony Lindgren <[email protected]> Signed-off-by: Michael Turquette <[email protected]>
1 parent fe76756 commit 42ed83f

File tree

3 files changed

+0
-35
lines changed

3 files changed

+0
-35
lines changed

arch/arm/mach-omap2/clock.c

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#include <linux/clk-provider.h>
2424
#include <linux/io.h>
2525
#include <linux/bitops.h>
26-
#include <linux/clk-private.h>
2726
#include <asm/cpu.h>
2827

2928
#include <trace/events/power.h>
@@ -629,21 +628,6 @@ const struct clk_hw_omap_ops clkhwops_wait = {
629628
.find_companion = omap2_clk_dflt_find_companion,
630629
};
631630

632-
/**
633-
* omap_clocks_register - register an array of omap_clk
634-
* @ocs: pointer to an array of omap_clk to register
635-
*/
636-
void __init omap_clocks_register(struct omap_clk oclks[], int cnt)
637-
{
638-
struct omap_clk *c;
639-
640-
for (c = oclks; c < oclks + cnt; c++) {
641-
clkdev_add(&c->lk);
642-
if (!__clk_init(NULL, c->lk.clk))
643-
omap2_init_clk_hw_omap_clocks(c->lk.clk);
644-
}
645-
}
646-
647631
/**
648632
* omap2_clk_switch_mpurate_at_boot - switch ARM MPU rate by boot-time argument
649633
* @mpurate_ck_name: clk name of the clock to change rate

arch/arm/mach-omap2/clock.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,6 @@ struct ti_clk_features {
245245
extern struct ti_clk_features ti_clk_features;
246246

247247
extern const struct clkops clkops_omap2_dflt_wait;
248-
extern const struct clkops clkops_dummy;
249248
extern const struct clkops clkops_omap2_dflt;
250249

251250
extern struct clk_functions omap2_clk_functions;
@@ -254,8 +253,6 @@ extern const struct clksel_rate gpt_32k_rates[];
254253
extern const struct clksel_rate gpt_sys_rates[];
255254
extern const struct clksel_rate gfx_l3_rates[];
256255
extern const struct clksel_rate dsp_ick_rates[];
257-
extern struct clk_core dummy_ck_core;
258-
extern struct clk dummy_ck;
259256

260257
extern const struct clk_hw_omap_ops clkhwops_iclk_wait;
261258
extern const struct clk_hw_omap_ops clkhwops_wait;
@@ -280,7 +277,5 @@ extern void __iomem *clk_memmaps[];
280277
extern int omap2_clkops_enable_clkdm(struct clk_hw *hw);
281278
extern void omap2_clkops_disable_clkdm(struct clk_hw *hw);
282279

283-
extern void omap_clocks_register(struct omap_clk *oclks, int cnt);
284-
285280
void __init ti_clk_init_features(void);
286281
#endif

arch/arm/mach-omap2/clock_common_data.c

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
* OMAP3xxx clock definition files.
1717
*/
1818

19-
#include <linux/clk-private.h>
2019
#include "clock.h"
2120

2221
/* clksel_rate data common to 24xx/343x */
@@ -114,16 +113,3 @@ const struct clksel_rate div31_1to31_rates[] = {
114113
{ .div = 31, .val = 31, .flags = RATE_IN_4430 | RATE_IN_AM33XX },
115114
{ .div = 0 },
116115
};
117-
118-
/* Clocks shared between various OMAP SoCs */
119-
120-
static struct clk_ops dummy_ck_ops = {};
121-
122-
struct clk_core dummy_ck_core = {
123-
.name = "dummy_clk",
124-
.ops = &dummy_ck_ops,
125-
.flags = CLK_IS_BASIC,
126-
};
127-
struct clk dummy_ck = {
128-
.core = &dummy_ck_core,
129-
};

0 commit comments

Comments
 (0)