projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
[linux-2.6-block.git]
/
arch
/
sh
/
boards
/
mach-highlander
/
setup.c
diff --git
a/arch/sh/boards/mach-highlander/setup.c
b/arch/sh/boards/mach-highlander/setup.c
index affd66747ba3dadaf441098fd85ac40da9cbb695..a5ecfbacaf36b37c3f812c5ca9b2189a3c077447 100644
(file)
--- a/
arch/sh/boards/mach-highlander/setup.c
+++ b/
arch/sh/boards/mach-highlander/setup.c
@@
-14,6
+14,7
@@
* for more details.
*/
#include <linux/init.h>
* for more details.
*/
#include <linux/init.h>
+#include <linux/io.h>
#include <linux/platform_device.h>
#include <linux/ata_platform.h>
#include <linux/types.h>
#include <linux/platform_device.h>
#include <linux/ata_platform.h>
#include <linux/types.h>
@@
-26,6
+27,7
@@
#include <net/ax88796.h>
#include <asm/machvec.h>
#include <mach/highlander.h>
#include <net/ax88796.h>
#include <asm/machvec.h>
#include <mach/highlander.h>
+#include <asm/clkdev.h>
#include <asm/clock.h>
#include <asm/heartbeat.h>
#include <asm/io.h>
#include <asm/clock.h>
#include <asm/heartbeat.h>
#include <asm/io.h>
@@
-326,7
+328,6
@@
static struct clk_ops ivdr_clk_ops = {
};
static struct clk ivdr_clk = {
};
static struct clk ivdr_clk = {
- .name = "ivdr_clk",
.ops = &ivdr_clk_ops,
};
.ops = &ivdr_clk_ops,
};
@@
-334,6
+335,13
@@
static struct clk *r7780rp_clocks[] = {
&ivdr_clk,
};
&ivdr_clk,
};
+#define CLKDEV_CON_ID(_id, _clk) { .con_id = _id, .clk = _clk }
+
+static struct clk_lookup lookups[] = {
+ /* main clocks */
+ CLKDEV_CON_ID("ivdr_clk", &ivdr_clk),
+};
+
static void r7780rp_power_off(void)
{
if (mach_is_r7780mp() || mach_is_r7785rp())
static void r7780rp_power_off(void)
{
if (mach_is_r7780mp() || mach_is_r7785rp())
@@
-370,6
+378,8
@@
static void __init highlander_setup(char **cmdline_p)
clk_enable(clk);
}
clk_enable(clk);
}
+ clkdev_add_table(lookups, ARRAY_SIZE(lookups));
+
__raw_writew(0x0000, PA_OBLED); /* Clear LED. */
if (mach_is_r7780rp())
__raw_writew(0x0000, PA_OBLED); /* Clear LED. */
if (mach_is_r7780rp())