|
@@ -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
|
|
|
|
|
@@ -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,
|
|
|
};
|
|
@@ -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,
|
|
|
};
|
|
@@ -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,
|
|
|
};
|
|
@@ -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;
|
|
@@ -167,5 +174,7 @@ int __init arch_clk_init(void)
|
|
|
|
|
|
clk_put(clk);
|
|
|
|
|
|
+ clkdev_add_table(lookups, ARRAY_SIZE(lookups));
|
|
|
+
|
|
|
return ret;
|
|
|
}
|