Skip to content

Commit

Permalink
sh: switch shx3 to clkdev
Browse files Browse the repository at this point in the history
This patch converts the remaining shx3 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 f0e7f90 commit 38803d7
Showing 1 changed file with 11 additions and 2 deletions.
13 changes: 11 additions & 2 deletions arch/sh/kernel/cpu/sh4a/clock-shx3.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@
*/
#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>

static int ifc_divisors[] = { 1, 2, 4 ,6 };
static int bfc_divisors[] = { 1, 1, 1, 1, 1, 12, 16, 18, 24, 32, 36, 48 };
Expand Down Expand Up @@ -94,7 +95,6 @@ static struct clk_ops shx3_shyway_clk_ops = {
};

static struct clk shx3_shyway_clk = {
.name = "shyway_clk",
.flags = CLK_ENABLE_ON_INIT,
.ops = &shx3_shyway_clk_ops,
};
Expand All @@ -107,6 +107,13 @@ static struct clk *shx3_onchip_clocks[] = {
&shx3_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", &shx3_shyway_clk),
};

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

clk_put(clk);

clkdev_add_table(lookups, ARRAY_SIZE(lookups));

return ret;
}

0 comments on commit 38803d7

Please sign in to comment.