aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/boards
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-03-29 23:38:01 -0400
committerPaul Mundt <lethal@linux-sh.org>2010-04-20 23:23:25 -0400
commit3366e3585fbf0d40ce6f2382b544851cf4df1654 (patch)
tree2d0e01291d103d28bdb67afffb816fa1d7023fbb /arch/sh/boards
parent4a6feab0ee5240c4bd5378d9f8a46b85718c68a7 (diff)
sh: Move platform smp ops in to their own structure.
This cribs the MIPS plat_smp_ops approach for wrapping up the platform ops. This will allow for mixing and matching different ops on the same platform in the future. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/boards')
-rw-r--r--arch/sh/boards/board-urquell.c3
-rw-r--r--arch/sh/boards/mach-sdk7786/setup.c3
-rw-r--r--arch/sh/boards/mach-x3proto/setup.c7
3 files changed, 13 insertions, 0 deletions
diff --git a/arch/sh/boards/board-urquell.c b/arch/sh/boards/board-urquell.c
index a9bd6e3ee10b..d81c609decc7 100644
--- a/arch/sh/boards/board-urquell.c
+++ b/arch/sh/boards/board-urquell.c
@@ -24,6 +24,7 @@
24#include <cpu/sh7786.h> 24#include <cpu/sh7786.h>
25#include <asm/heartbeat.h> 25#include <asm/heartbeat.h>
26#include <asm/sizes.h> 26#include <asm/sizes.h>
27#include <asm/smp-ops.h>
27 28
28/* 29/*
29 * bit 1234 5678 30 * bit 1234 5678
@@ -203,6 +204,8 @@ static void __init urquell_setup(char **cmdline_p)
203 printk(KERN_INFO "Renesas Technology Corp. Urquell support.\n"); 204 printk(KERN_INFO "Renesas Technology Corp. Urquell support.\n");
204 205
205 pm_power_off = urquell_power_off; 206 pm_power_off = urquell_power_off;
207
208 register_smp_ops(&shx3_smp_ops);
206} 209}
207 210
208/* 211/*
diff --git a/arch/sh/boards/mach-sdk7786/setup.c b/arch/sh/boards/mach-sdk7786/setup.c
index 0c057a93fe29..2ec1ea5cf8ef 100644
--- a/arch/sh/boards/mach-sdk7786/setup.c
+++ b/arch/sh/boards/mach-sdk7786/setup.c
@@ -21,6 +21,7 @@
21#include <asm/heartbeat.h> 21#include <asm/heartbeat.h>
22#include <asm/sizes.h> 22#include <asm/sizes.h>
23#include <asm/reboot.h> 23#include <asm/reboot.h>
24#include <asm/smp-ops.h>
24 25
25static struct resource heartbeat_resource = { 26static struct resource heartbeat_resource = {
26 .start = 0x07fff8b0, 27 .start = 0x07fff8b0,
@@ -189,6 +190,8 @@ static void __init sdk7786_setup(char **cmdline_p)
189 190
190 machine_ops.restart = sdk7786_restart; 191 machine_ops.restart = sdk7786_restart;
191 pm_power_off = sdk7786_power_off; 192 pm_power_off = sdk7786_power_off;
193
194 register_smp_ops(&shx3_smp_ops);
192} 195}
193 196
194/* 197/*
diff --git a/arch/sh/boards/mach-x3proto/setup.c b/arch/sh/boards/mach-x3proto/setup.c
index e284592fd42a..102bf56befb4 100644
--- a/arch/sh/boards/mach-x3proto/setup.c
+++ b/arch/sh/boards/mach-x3proto/setup.c
@@ -19,6 +19,7 @@
19#include <linux/usb/r8a66597.h> 19#include <linux/usb/r8a66597.h>
20#include <linux/usb/m66592.h> 20#include <linux/usb/m66592.h>
21#include <asm/ilsel.h> 21#include <asm/ilsel.h>
22#include <asm/smp-ops.h>
22 23
23static struct resource heartbeat_resources[] = { 24static struct resource heartbeat_resources[] = {
24 [0] = { 25 [0] = {
@@ -152,7 +153,13 @@ static void __init x3proto_init_irq(void)
152 __raw_writel(__raw_readl(0xfe410000) | (1 << 21), 0xfe410000); 153 __raw_writel(__raw_readl(0xfe410000) | (1 << 21), 0xfe410000);
153} 154}
154 155
156static void __init x3proto_setup(char **cmdline_p)
157{
158 register_smp_ops(&shx3_smp_ops);
159}
160
155static struct sh_machine_vector mv_x3proto __initmv = { 161static struct sh_machine_vector mv_x3proto __initmv = {
156 .mv_name = "x3proto", 162 .mv_name = "x3proto",
163 .mv_setup = x3proto_setup,
157 .mv_init_irq = x3proto_init_irq, 164 .mv_init_irq = x3proto_init_irq,
158}; 165};