git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
sh
/
kernel
/
cpu
/
sh4a
/
clock-sh7780.c
diff --git
a/arch/sh/kernel/cpu/sh4a/clock-sh7780.c
b/arch/sh/kernel/cpu/sh4a/clock-sh7780.c
index
150963a
..
62d7063
100644
(file)
--- 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/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>
#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 = {
};
static struct clk sh7780_shyway_clk = {
- .name = "shyway_clk",
.flags = CLK_ENABLE_ON_INIT,
.ops = &sh7780_shyway_clk_ops,
};
.flags = CLK_ENABLE_ON_INIT,
.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)
{
struct clk *clk;
int __init arch_clk_init(void)
{
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;
}