diff options
| author | Magnus Damm <damm@opensource.se> | 2010-05-11 11:36:24 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-13 10:36:56 +0200 |
| commit | 29497ec42c7c3a42682e5538ca7f96cd9a00fcbb (patch) | |
| tree | e6c45d5ddda0e346fee6544b94662ac60b645672 /arch/sh/kernel/cpu/sh4a/clock-sh7780.c | |
| parent | sh: switch sh7786 to clkdev (diff) | |
| download | linux-29497ec42c7c3a42682e5538ca7f96cd9a00fcbb.tar.xz linux-29497ec42c7c3a42682e5538ca7f96cd9a00fcbb.zip | |
sh: switch sh7780 to clkdev
This patch converts the remaining sh7780 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>
Diffstat (limited to 'arch/sh/kernel/cpu/sh4a/clock-sh7780.c')
| -rw-r--r-- | arch/sh/kernel/cpu/sh4a/clock-sh7780.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7780.c b/arch/sh/kernel/cpu/sh4a/clock-sh7780.c index 150963a6001e..62d706350060 100644 --- a/arch/sh/kernel/cpu/sh4a/clock-sh7780.c +++ b/arch/sh/kernel/cpu/sh4a/clock-sh7780.c @@ -11,6 +11,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> @@ -83,7 +85,6 @@ static struct clk_ops sh7780_shyway_clk_ops = { }; static struct clk sh7780_shyway_clk = { - .name = "shyway_clk", .flags = CLK_ENABLE_ON_INIT, .ops = &sh7780_shyway_clk_ops, }; @@ -96,6 +97,13 @@ static struct clk *sh7780_onchip_clocks[] = { &sh7780_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", &sh7780_shyway_clk), +}; + int __init arch_clk_init(void) { struct clk *clk; @@ -113,5 +121,7 @@ int __init arch_clk_init(void) clk_put(clk); + clkdev_add_table(lookups, ARRAY_SIZE(lookups)); + return ret; } |