Skip to content

Commit

Permalink
sh: switch sh4-202 to clkdev
Browse files Browse the repository at this point in the history
This patch converts the remaining sh4-202 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 38803d7 commit 9c352bc
Showing 1 changed file with 13 additions and 4 deletions.
17 changes: 13 additions & 4 deletions arch/sh/kernel/cpu/sh4/clock-sh4-202.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/err.h>
#include <linux/io.h>
#include <asm/clkdev.h>
#include <asm/clock.h>
#include <asm/freq.h>
#include <asm/io.h>

#define CPG2_FRQCR3 0xfe0a0018

Expand Down Expand Up @@ -45,7 +46,6 @@ static struct clk_ops sh4202_emi_clk_ops = {
};

static struct clk sh4202_emi_clk = {
.name = "emi_clk",
.flags = CLK_ENABLE_ON_INIT,
.ops = &sh4202_emi_clk_ops,
};
Expand All @@ -61,7 +61,6 @@ static struct clk_ops sh4202_femi_clk_ops = {
};

static struct clk sh4202_femi_clk = {
.name = "femi_clk",
.flags = CLK_ENABLE_ON_INIT,
.ops = &sh4202_femi_clk_ops,
};
Expand Down Expand Up @@ -139,7 +138,6 @@ static struct clk_ops sh4202_shoc_clk_ops = {
};

static struct clk sh4202_shoc_clk = {
.name = "shoc_clk",
.flags = CLK_ENABLE_ON_INIT,
.ops = &sh4202_shoc_clk_ops,
};
Expand All @@ -150,6 +148,15 @@ static struct clk *sh4202_onchip_clocks[] = {
&sh4202_shoc_clk,
};

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

static struct clk_lookup lookups[] = {
/* main clocks */
CLKDEV_CON_ID("emi_clk", &sh4202_emi_clk),
CLKDEV_CON_ID("femi_clk", &sh4202_femi_clk),
CLKDEV_CON_ID("shoc_clk", &sh4202_shoc_clk),
};

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

clk_put(clk);

clkdev_add_table(lookups, ARRAY_SIZE(lookups));

return ret;
}

0 comments on commit 9c352bc

Please sign in to comment.