mirror of https://gitee.com/openkylin/linux.git
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>
This commit is contained in:
parent
2cf79bea43
commit
29497ec42c
|
@ -11,6 +11,8 @@
|
||||||
*/
|
*/
|
||||||
#include <linux/init.h>
|
#include <linux/init.h>
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
|
#include <linux/io.h>
|
||||||
|
#include <asm/clkdev.h>
|
||||||
#include <asm/clock.h>
|
#include <asm/clock.h>
|
||||||
#include <asm/freq.h>
|
#include <asm/freq.h>
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
|
@ -83,7 +85,6 @@ static struct clk_ops sh7780_shyway_clk_ops = {
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct clk sh7780_shyway_clk = {
|
static struct clk sh7780_shyway_clk = {
|
||||||
.name = "shyway_clk",
|
|
||||||
.flags = CLK_ENABLE_ON_INIT,
|
.flags = CLK_ENABLE_ON_INIT,
|
||||||
.ops = &sh7780_shyway_clk_ops,
|
.ops = &sh7780_shyway_clk_ops,
|
||||||
};
|
};
|
||||||
|
@ -96,6 +97,13 @@ static struct clk *sh7780_onchip_clocks[] = {
|
||||||
&sh7780_shyway_clk,
|
&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)
|
int __init arch_clk_init(void)
|
||||||
{
|
{
|
||||||
struct clk *clk;
|
struct clk *clk;
|
||||||
|
@ -113,5 +121,7 @@ int __init arch_clk_init(void)
|
||||||
|
|
||||||
clk_put(clk);
|
clk_put(clk);
|
||||||
|
|
||||||
|
clkdev_add_table(lookups, ARRAY_SIZE(lookups));
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue