Skip to content

Commit

Permalink
sh: switch sh7763 to clkdev
Browse files Browse the repository at this point in the history
This patch converts the remaining sh7763 clocks
to use clkdev for lookup. The now unused name
and id from struct clk are also removed.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Magnus Damm authored and Paul Mundt committed May 13, 2010
1 parent 29497ec commit d6a9421
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion arch/sh/kernel/cpu/sh4a/clock-sh7763.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
*/
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/io.h>
#include <asm/clkdev.h>
#include <asm/clock.h>
#include <asm/freq.h>
#include <asm/io.h>
Expand Down Expand Up @@ -77,7 +79,6 @@ static struct clk_ops sh7763_shyway_clk_ops = {
};

static struct clk sh7763_shyway_clk = {
.name = "shyway_clk",
.flags = CLK_ENABLE_ON_INIT,
.ops = &sh7763_shyway_clk_ops,
};
Expand All @@ -90,6 +91,13 @@ static struct clk *sh7763_onchip_clocks[] = {
&sh7763_shyway_clk,
};

#define CLKDEV_CON_ID(_id, _clk) { .con_id = _id, .clk = _clk }

static struct clk_lookup lookups[] = {
/* main clocks */
CLKDEV_CON_ID("shyway_clk", &sh7763_shyway_clk),
};

int __init arch_clk_init(void)
{
struct clk *clk;
Expand All @@ -107,5 +115,7 @@ int __init arch_clk_init(void)

clk_put(clk);

clkdev_add_table(lookups, ARRAY_SIZE(lookups));

return ret;
}

0 comments on commit d6a9421

Please sign in to comment.