diff options
Diffstat (limited to 'arch/sh/boards/renesas')
-rw-r--r-- | arch/sh/boards/renesas/edosk7705/setup.c | 29 | ||||
-rw-r--r-- | arch/sh/boards/renesas/hs7751rvoip/setup.c | 96 | ||||
-rw-r--r-- | arch/sh/boards/renesas/r7780rp/setup.c | 83 | ||||
-rw-r--r-- | arch/sh/boards/renesas/rts7751r2d/Makefile | 4 | ||||
-rw-r--r-- | arch/sh/boards/renesas/rts7751r2d/mach.c | 66 | ||||
-rw-r--r-- | arch/sh/boards/renesas/rts7751r2d/setup.c | 62 | ||||
-rw-r--r-- | arch/sh/boards/renesas/systemh/setup.c | 16 |
7 files changed, 151 insertions, 205 deletions
diff --git a/arch/sh/boards/renesas/edosk7705/setup.c b/arch/sh/boards/renesas/edosk7705/setup.c index ba143fa4afaa..ec5be0107719 100644 --- a/arch/sh/boards/renesas/edosk7705/setup.c +++ b/arch/sh/boards/renesas/edosk7705/setup.c | |||
@@ -8,19 +8,21 @@ | |||
8 | * Modified for edosk7705 development | 8 | * Modified for edosk7705 development |
9 | * board by S. Dunn, 2003. | 9 | * board by S. Dunn, 2003. |
10 | */ | 10 | */ |
11 | |||
12 | #include <linux/init.h> | 11 | #include <linux/init.h> |
13 | #include <asm/machvec.h> | 12 | #include <asm/machvec.h> |
14 | #include <asm/machvec_init.h> | ||
15 | #include <asm/edosk7705/io.h> | 13 | #include <asm/edosk7705/io.h> |
16 | 14 | ||
17 | static void init_edosk7705(void); | 15 | static void __init sh_edosk7705_init_irq(void) |
16 | { | ||
17 | /* This is the Ethernet interrupt */ | ||
18 | make_imask_irq(0x09); | ||
19 | } | ||
18 | 20 | ||
19 | /* | 21 | /* |
20 | * The Machine Vector | 22 | * The Machine Vector |
21 | */ | 23 | */ |
22 | |||
23 | struct sh_machine_vector mv_edosk7705 __initmv = { | 24 | struct sh_machine_vector mv_edosk7705 __initmv = { |
25 | .mv_name = "EDOSK7705", | ||
24 | .mv_nr_irqs = 80, | 26 | .mv_nr_irqs = 80, |
25 | 27 | ||
26 | .mv_inb = sh_edosk7705_inb, | 28 | .mv_inb = sh_edosk7705_inb, |
@@ -37,23 +39,6 @@ struct sh_machine_vector mv_edosk7705 __initmv = { | |||
37 | .mv_outsl = sh_edosk7705_outsl, | 39 | .mv_outsl = sh_edosk7705_outsl, |
38 | 40 | ||
39 | .mv_isa_port2addr = sh_edosk7705_isa_port2addr, | 41 | .mv_isa_port2addr = sh_edosk7705_isa_port2addr, |
40 | .mv_init_irq = init_edosk7705, | 42 | .mv_init_irq = sh_edosk7705_init_irq, |
41 | }; | 43 | }; |
42 | ALIAS_MV(edosk7705) | 44 | ALIAS_MV(edosk7705) |
43 | |||
44 | static void __init init_edosk7705(void) | ||
45 | { | ||
46 | /* This is the Ethernet interrupt */ | ||
47 | make_imask_irq(0x09); | ||
48 | } | ||
49 | |||
50 | const char *get_system_type(void) | ||
51 | { | ||
52 | return "EDOSK7705"; | ||
53 | } | ||
54 | |||
55 | void __init platform_setup(void) | ||
56 | { | ||
57 | /* Nothing .. */ | ||
58 | } | ||
59 | |||
diff --git a/arch/sh/boards/renesas/hs7751rvoip/setup.c b/arch/sh/boards/renesas/hs7751rvoip/setup.c index a2cbcc5d530f..0414c15c3458 100644 --- a/arch/sh/boards/renesas/hs7751rvoip/setup.c +++ b/arch/sh/boards/renesas/hs7751rvoip/setup.c | |||
@@ -1,15 +1,12 @@ | |||
1 | /* | 1 | /* |
2 | * linux/arch/sh/kernel/setup_hs7751rvoip.c | 2 | * Renesas Technology Sales HS7751RVoIP Support. |
3 | * | 3 | * |
4 | * Copyright (C) 2000 Kazumoto Kojima | 4 | * Copyright (C) 2000 Kazumoto Kojima |
5 | * | 5 | * |
6 | * Renesas Technology Sales HS7751RVoIP Support. | ||
7 | * | ||
8 | * Modified for HS7751RVoIP by | 6 | * Modified for HS7751RVoIP by |
9 | * Atom Create Engineering Co., Ltd. 2002. | 7 | * Atom Create Engineering Co., Ltd. 2002. |
10 | * Lineo uSolutions, Inc. 2003. | 8 | * Lineo uSolutions, Inc. 2003. |
11 | */ | 9 | */ |
12 | |||
13 | #include <linux/init.h> | 10 | #include <linux/init.h> |
14 | #include <linux/irq.h> | 11 | #include <linux/irq.h> |
15 | #include <linux/mm.h> | 12 | #include <linux/mm.h> |
@@ -23,8 +20,6 @@ | |||
23 | #include <asm/rtc.h> | 20 | #include <asm/rtc.h> |
24 | #include <asm/irq.h> | 21 | #include <asm/irq.h> |
25 | 22 | ||
26 | unsigned int debug_counter; | ||
27 | |||
28 | static void __init hs7751rvoip_init_irq(void) | 23 | static void __init hs7751rvoip_init_irq(void) |
29 | { | 24 | { |
30 | #if defined(CONFIG_HS7751RVOIP_CODEC) | 25 | #if defined(CONFIG_HS7751RVOIP_CODEC) |
@@ -35,56 +30,11 @@ static void __init hs7751rvoip_init_irq(void) | |||
35 | init_hs7751rvoip_IRQ(); | 30 | init_hs7751rvoip_IRQ(); |
36 | } | 31 | } |
37 | 32 | ||
38 | struct sh_machine_vector mv_hs7751rvoip __initmv = { | ||
39 | .mv_nr_irqs = 72, | ||
40 | |||
41 | .mv_inb = hs7751rvoip_inb, | ||
42 | .mv_inw = hs7751rvoip_inw, | ||
43 | .mv_inl = hs7751rvoip_inl, | ||
44 | .mv_outb = hs7751rvoip_outb, | ||
45 | .mv_outw = hs7751rvoip_outw, | ||
46 | .mv_outl = hs7751rvoip_outl, | ||
47 | |||
48 | .mv_inb_p = hs7751rvoip_inb_p, | ||
49 | .mv_inw_p = hs7751rvoip_inw, | ||
50 | .mv_inl_p = hs7751rvoip_inl, | ||
51 | .mv_outb_p = hs7751rvoip_outb_p, | ||
52 | .mv_outw_p = hs7751rvoip_outw, | ||
53 | .mv_outl_p = hs7751rvoip_outl, | ||
54 | |||
55 | .mv_insb = hs7751rvoip_insb, | ||
56 | .mv_insw = hs7751rvoip_insw, | ||
57 | .mv_insl = hs7751rvoip_insl, | ||
58 | .mv_outsb = hs7751rvoip_outsb, | ||
59 | .mv_outsw = hs7751rvoip_outsw, | ||
60 | .mv_outsl = hs7751rvoip_outsl, | ||
61 | |||
62 | .mv_init_irq = hs7751rvoip_init_irq, | ||
63 | .mv_ioport_map = hs7751rvoip_ioport_map, | ||
64 | }; | ||
65 | ALIAS_MV(hs7751rvoip) | ||
66 | |||
67 | const char *get_system_type(void) | ||
68 | { | ||
69 | return "HS7751RVoIP"; | ||
70 | } | ||
71 | |||
72 | static void hs7751rvoip_power_off(void) | 33 | static void hs7751rvoip_power_off(void) |
73 | { | 34 | { |
74 | ctrl_outw(ctrl_inw(PA_OUTPORTR) & 0xffdf, PA_OUTPORTR); | 35 | ctrl_outw(ctrl_inw(PA_OUTPORTR) & 0xffdf, PA_OUTPORTR); |
75 | } | 36 | } |
76 | 37 | ||
77 | /* | ||
78 | * Initialize the board | ||
79 | */ | ||
80 | void __init platform_setup(void) | ||
81 | { | ||
82 | printk(KERN_INFO "Renesas Technology Sales HS7751RVoIP-2 support.\n"); | ||
83 | ctrl_outb(0xf0, PA_OUTPORTR); | ||
84 | pm_power_off = hs7751rvoip_power_off; | ||
85 | debug_counter = 0; | ||
86 | } | ||
87 | |||
88 | void *area5_io8_base; | 38 | void *area5_io8_base; |
89 | void *area6_io8_base; | 39 | void *area6_io8_base; |
90 | void *area5_io16_base; | 40 | void *area5_io16_base; |
@@ -127,4 +77,46 @@ static int __init hs7751rvoip_cf_init(void) | |||
127 | return 0; | 77 | return 0; |
128 | } | 78 | } |
129 | 79 | ||
130 | __initcall(hs7751rvoip_cf_init); | 80 | /* |
81 | * Initialize the board | ||
82 | */ | ||
83 | static void __init hs7751rvoip_setup(char **cmdline_p) | ||
84 | { | ||
85 | device_initcall(hs7751rvoip_cf_init); | ||
86 | |||
87 | ctrl_outb(0xf0, PA_OUTPORTR); | ||
88 | pm_power_off = hs7751rvoip_power_off; | ||
89 | |||
90 | printk(KERN_INFO "Renesas Technology Sales HS7751RVoIP-2 support.\n"); | ||
91 | } | ||
92 | |||
93 | struct sh_machine_vector mv_hs7751rvoip __initmv = { | ||
94 | .mv_name = "HS7751RVoIP", | ||
95 | .mv_setup = hs7751rvoip_setup, | ||
96 | .mv_nr_irqs = 72, | ||
97 | |||
98 | .mv_inb = hs7751rvoip_inb, | ||
99 | .mv_inw = hs7751rvoip_inw, | ||
100 | .mv_inl = hs7751rvoip_inl, | ||
101 | .mv_outb = hs7751rvoip_outb, | ||
102 | .mv_outw = hs7751rvoip_outw, | ||
103 | .mv_outl = hs7751rvoip_outl, | ||
104 | |||
105 | .mv_inb_p = hs7751rvoip_inb_p, | ||
106 | .mv_inw_p = hs7751rvoip_inw, | ||
107 | .mv_inl_p = hs7751rvoip_inl, | ||
108 | .mv_outb_p = hs7751rvoip_outb_p, | ||
109 | .mv_outw_p = hs7751rvoip_outw, | ||
110 | .mv_outl_p = hs7751rvoip_outl, | ||
111 | |||
112 | .mv_insb = hs7751rvoip_insb, | ||
113 | .mv_insw = hs7751rvoip_insw, | ||
114 | .mv_insl = hs7751rvoip_insl, | ||
115 | .mv_outsb = hs7751rvoip_outsb, | ||
116 | .mv_outsw = hs7751rvoip_outsw, | ||
117 | .mv_outsl = hs7751rvoip_outsl, | ||
118 | |||
119 | .mv_init_irq = hs7751rvoip_init_irq, | ||
120 | .mv_ioport_map = hs7751rvoip_ioport_map, | ||
121 | }; | ||
122 | ALIAS_MV(hs7751rvoip) | ||
diff --git a/arch/sh/boards/renesas/r7780rp/setup.c b/arch/sh/boards/renesas/r7780rp/setup.c index 0e4d5e1b541c..b941aa0aa34e 100644 --- a/arch/sh/boards/renesas/r7780rp/setup.c +++ b/arch/sh/boards/renesas/r7780rp/setup.c | |||
@@ -20,41 +20,6 @@ | |||
20 | extern void heartbeat_r7780rp(void); | 20 | extern void heartbeat_r7780rp(void); |
21 | extern void init_r7780rp_IRQ(void); | 21 | extern void init_r7780rp_IRQ(void); |
22 | 22 | ||
23 | /* | ||
24 | * The Machine Vector | ||
25 | */ | ||
26 | struct sh_machine_vector mv_r7780rp __initmv = { | ||
27 | .mv_nr_irqs = 109, | ||
28 | |||
29 | .mv_inb = r7780rp_inb, | ||
30 | .mv_inw = r7780rp_inw, | ||
31 | .mv_inl = r7780rp_inl, | ||
32 | .mv_outb = r7780rp_outb, | ||
33 | .mv_outw = r7780rp_outw, | ||
34 | .mv_outl = r7780rp_outl, | ||
35 | |||
36 | .mv_inb_p = r7780rp_inb_p, | ||
37 | .mv_inw_p = r7780rp_inw, | ||
38 | .mv_inl_p = r7780rp_inl, | ||
39 | .mv_outb_p = r7780rp_outb_p, | ||
40 | .mv_outw_p = r7780rp_outw, | ||
41 | .mv_outl_p = r7780rp_outl, | ||
42 | |||
43 | .mv_insb = r7780rp_insb, | ||
44 | .mv_insw = r7780rp_insw, | ||
45 | .mv_insl = r7780rp_insl, | ||
46 | .mv_outsb = r7780rp_outsb, | ||
47 | .mv_outsw = r7780rp_outsw, | ||
48 | .mv_outsl = r7780rp_outsl, | ||
49 | |||
50 | .mv_ioport_map = r7780rp_ioport_map, | ||
51 | .mv_init_irq = init_r7780rp_IRQ, | ||
52 | #ifdef CONFIG_HEARTBEAT | ||
53 | .mv_heartbeat = heartbeat_r7780rp, | ||
54 | #endif | ||
55 | }; | ||
56 | ALIAS_MV(r7780rp) | ||
57 | |||
58 | static struct resource m66596_usb_host_resources[] = { | 23 | static struct resource m66596_usb_host_resources[] = { |
59 | [0] = { | 24 | [0] = { |
60 | .start = 0xa4800000, | 25 | .start = 0xa4800000, |
@@ -88,7 +53,6 @@ static int __init r7780rp_devices_setup(void) | |||
88 | return platform_add_devices(r7780rp_devices, | 53 | return platform_add_devices(r7780rp_devices, |
89 | ARRAY_SIZE(r7780rp_devices)); | 54 | ARRAY_SIZE(r7780rp_devices)); |
90 | } | 55 | } |
91 | __initcall(r7780rp_devices_setup); | ||
92 | 56 | ||
93 | /* | 57 | /* |
94 | * Platform specific clocks | 58 | * Platform specific clocks |
@@ -117,11 +81,6 @@ static struct clk *r7780rp_clocks[] = { | |||
117 | &ivdr_clk, | 81 | &ivdr_clk, |
118 | }; | 82 | }; |
119 | 83 | ||
120 | const char *get_system_type(void) | ||
121 | { | ||
122 | return "Highlander R7780RP-1"; | ||
123 | } | ||
124 | |||
125 | static void r7780rp_power_off(void) | 84 | static void r7780rp_power_off(void) |
126 | { | 85 | { |
127 | #ifdef CONFIG_SH_R7780MP | 86 | #ifdef CONFIG_SH_R7780MP |
@@ -132,11 +91,13 @@ static void r7780rp_power_off(void) | |||
132 | /* | 91 | /* |
133 | * Initialize the board | 92 | * Initialize the board |
134 | */ | 93 | */ |
135 | void __init platform_setup(void) | 94 | static void __init r7780rp_setup(char **cmdline_p) |
136 | { | 95 | { |
137 | u16 ver = ctrl_inw(PA_VERREG); | 96 | u16 ver = ctrl_inw(PA_VERREG); |
138 | int i; | 97 | int i; |
139 | 98 | ||
99 | device_initcall(r7780rp_devices_setup); | ||
100 | |||
140 | printk(KERN_INFO "Renesas Solutions Highlander R7780RP-1 support.\n"); | 101 | printk(KERN_INFO "Renesas Solutions Highlander R7780RP-1 support.\n"); |
141 | 102 | ||
142 | printk(KERN_INFO "Board version: %d (revision %d), " | 103 | printk(KERN_INFO "Board version: %d (revision %d), " |
@@ -162,3 +123,41 @@ void __init platform_setup(void) | |||
162 | 123 | ||
163 | pm_power_off = r7780rp_power_off; | 124 | pm_power_off = r7780rp_power_off; |
164 | } | 125 | } |
126 | |||
127 | /* | ||
128 | * The Machine Vector | ||
129 | */ | ||
130 | struct sh_machine_vector mv_r7780rp __initmv = { | ||
131 | .mv_name = "Highlander R7780RP-1", | ||
132 | .mv_setup = r7780rp_setup, | ||
133 | |||
134 | .mv_nr_irqs = 109, | ||
135 | |||
136 | .mv_inb = r7780rp_inb, | ||
137 | .mv_inw = r7780rp_inw, | ||
138 | .mv_inl = r7780rp_inl, | ||
139 | .mv_outb = r7780rp_outb, | ||
140 | .mv_outw = r7780rp_outw, | ||
141 | .mv_outl = r7780rp_outl, | ||
142 | |||
143 | .mv_inb_p = r7780rp_inb_p, | ||
144 | .mv_inw_p = r7780rp_inw, | ||
145 | .mv_inl_p = r7780rp_inl, | ||
146 | .mv_outb_p = r7780rp_outb_p, | ||
147 | .mv_outw_p = r7780rp_outw, | ||
148 | .mv_outl_p = r7780rp_outl, | ||
149 | |||
150 | .mv_insb = r7780rp_insb, | ||
151 | .mv_insw = r7780rp_insw, | ||
152 | .mv_insl = r7780rp_insl, | ||
153 | .mv_outsb = r7780rp_outsb, | ||
154 | .mv_outsw = r7780rp_outsw, | ||
155 | .mv_outsl = r7780rp_outsl, | ||
156 | |||
157 | .mv_ioport_map = r7780rp_ioport_map, | ||
158 | .mv_init_irq = init_r7780rp_IRQ, | ||
159 | #ifdef CONFIG_HEARTBEAT | ||
160 | .mv_heartbeat = heartbeat_r7780rp, | ||
161 | #endif | ||
162 | }; | ||
163 | ALIAS_MV(r7780rp) | ||
diff --git a/arch/sh/boards/renesas/rts7751r2d/Makefile b/arch/sh/boards/renesas/rts7751r2d/Makefile index eee1ed6f5727..686fc9ea5989 100644 --- a/arch/sh/boards/renesas/rts7751r2d/Makefile +++ b/arch/sh/boards/renesas/rts7751r2d/Makefile | |||
@@ -2,5 +2,5 @@ | |||
2 | # Makefile for the RTS7751R2D specific parts of the kernel | 2 | # Makefile for the RTS7751R2D specific parts of the kernel |
3 | # | 3 | # |
4 | 4 | ||
5 | obj-y := mach.o setup.o io.o irq.o led.o | 5 | obj-y := setup.o io.o irq.o |
6 | 6 | obj-$(CONFIG_HEARTBEAT) += led.o | |
diff --git a/arch/sh/boards/renesas/rts7751r2d/mach.c b/arch/sh/boards/renesas/rts7751r2d/mach.c deleted file mode 100644 index fe3e8735e9f8..000000000000 --- a/arch/sh/boards/renesas/rts7751r2d/mach.c +++ /dev/null | |||
@@ -1,66 +0,0 @@ | |||
1 | /* | ||
2 | * linux/arch/sh/kernel/mach_rts7751r2d.c | ||
3 | * | ||
4 | * Minor tweak of mach_se.c file to reference rts7751r2d-specific items. | ||
5 | * | ||
6 | * May be copied or modified under the terms of the GNU General Public | ||
7 | * License. See linux/COPYING for more information. | ||
8 | * | ||
9 | * Machine vector for the Renesas Technology sales RTS7751R2D | ||
10 | */ | ||
11 | |||
12 | #include <linux/init.h> | ||
13 | #include <linux/types.h> | ||
14 | |||
15 | #include <asm/machvec.h> | ||
16 | #include <asm/rtc.h> | ||
17 | #include <asm/irq.h> | ||
18 | #include <asm/mach/rts7751r2d.h> | ||
19 | |||
20 | extern void heartbeat_rts7751r2d(void); | ||
21 | extern void init_rts7751r2d_IRQ(void); | ||
22 | extern int rts7751r2d_irq_demux(int irq); | ||
23 | |||
24 | extern void *voyagergx_consistent_alloc(struct device *, size_t, dma_addr_t *, gfp_t); | ||
25 | extern int voyagergx_consistent_free(struct device *, size_t, void *, dma_addr_t); | ||
26 | |||
27 | /* | ||
28 | * The Machine Vector | ||
29 | */ | ||
30 | |||
31 | struct sh_machine_vector mv_rts7751r2d __initmv = { | ||
32 | .mv_nr_irqs = 72, | ||
33 | |||
34 | .mv_inb = rts7751r2d_inb, | ||
35 | .mv_inw = rts7751r2d_inw, | ||
36 | .mv_inl = rts7751r2d_inl, | ||
37 | .mv_outb = rts7751r2d_outb, | ||
38 | .mv_outw = rts7751r2d_outw, | ||
39 | .mv_outl = rts7751r2d_outl, | ||
40 | |||
41 | .mv_inb_p = rts7751r2d_inb_p, | ||
42 | .mv_inw_p = rts7751r2d_inw, | ||
43 | .mv_inl_p = rts7751r2d_inl, | ||
44 | .mv_outb_p = rts7751r2d_outb_p, | ||
45 | .mv_outw_p = rts7751r2d_outw, | ||
46 | .mv_outl_p = rts7751r2d_outl, | ||
47 | |||
48 | .mv_insb = rts7751r2d_insb, | ||
49 | .mv_insw = rts7751r2d_insw, | ||
50 | .mv_insl = rts7751r2d_insl, | ||
51 | .mv_outsb = rts7751r2d_outsb, | ||
52 | .mv_outsw = rts7751r2d_outsw, | ||
53 | .mv_outsl = rts7751r2d_outsl, | ||
54 | |||
55 | .mv_init_irq = init_rts7751r2d_IRQ, | ||
56 | #ifdef CONFIG_HEARTBEAT | ||
57 | .mv_heartbeat = heartbeat_rts7751r2d, | ||
58 | #endif | ||
59 | .mv_irq_demux = rts7751r2d_irq_demux, | ||
60 | |||
61 | #ifdef CONFIG_USB_OHCI_HCD | ||
62 | .mv_consistent_alloc = voyagergx_consistent_alloc, | ||
63 | .mv_consistent_free = voyagergx_consistent_free, | ||
64 | #endif | ||
65 | }; | ||
66 | ALIAS_MV(rts7751r2d) | ||
diff --git a/arch/sh/boards/renesas/rts7751r2d/setup.c b/arch/sh/boards/renesas/rts7751r2d/setup.c index bb56c018f2ee..20597a6e6702 100644 --- a/arch/sh/boards/renesas/rts7751r2d/setup.c +++ b/arch/sh/boards/renesas/rts7751r2d/setup.c | |||
@@ -13,9 +13,17 @@ | |||
13 | #include <linux/serial_8250.h> | 13 | #include <linux/serial_8250.h> |
14 | #include <linux/pm.h> | 14 | #include <linux/pm.h> |
15 | #include <asm/io.h> | 15 | #include <asm/io.h> |
16 | #include <asm/machvec.h> | ||
16 | #include <asm/mach/rts7751r2d.h> | 17 | #include <asm/mach/rts7751r2d.h> |
17 | #include <asm/voyagergx.h> | 18 | #include <asm/voyagergx.h> |
18 | 19 | ||
20 | extern void heartbeat_rts7751r2d(void); | ||
21 | extern void init_rts7751r2d_IRQ(void); | ||
22 | extern int rts7751r2d_irq_demux(int irq); | ||
23 | |||
24 | extern void *voyagergx_consistent_alloc(struct device *, size_t, dma_addr_t *, gfp_t); | ||
25 | extern int voyagergx_consistent_free(struct device *, size_t, void *, dma_addr_t); | ||
26 | |||
19 | static struct plat_serial8250_port uart_platform_data[] = { | 27 | static struct plat_serial8250_port uart_platform_data[] = { |
20 | { | 28 | { |
21 | .membase = (void *)VOYAGER_UART_BASE, | 29 | .membase = (void *)VOYAGER_UART_BASE, |
@@ -70,12 +78,6 @@ static int __init rts7751r2d_devices_setup(void) | |||
70 | return platform_add_devices(rts7751r2d_devices, | 78 | return platform_add_devices(rts7751r2d_devices, |
71 | ARRAY_SIZE(rts7751r2d_devices)); | 79 | ARRAY_SIZE(rts7751r2d_devices)); |
72 | } | 80 | } |
73 | __initcall(rts7751r2d_devices_setup); | ||
74 | |||
75 | const char *get_system_type(void) | ||
76 | { | ||
77 | return "RTS7751R2D"; | ||
78 | } | ||
79 | 81 | ||
80 | static void rts7751r2d_power_off(void) | 82 | static void rts7751r2d_power_off(void) |
81 | { | 83 | { |
@@ -85,12 +87,56 @@ static void rts7751r2d_power_off(void) | |||
85 | /* | 87 | /* |
86 | * Initialize the board | 88 | * Initialize the board |
87 | */ | 89 | */ |
88 | void __init platform_setup(void) | 90 | static void __init rts7751r2d_setup(char **cmdline_p) |
89 | { | 91 | { |
90 | printk(KERN_INFO "Renesas Technology Sales RTS7751R2D support.\n"); | 92 | device_initcall(rts7751r2d_devices_setup); |
93 | |||
91 | ctrl_outw(0x0000, PA_OUTPORT); | 94 | ctrl_outw(0x0000, PA_OUTPORT); |
92 | pm_power_off = rts7751r2d_power_off; | 95 | pm_power_off = rts7751r2d_power_off; |
93 | 96 | ||
94 | voyagergx_serial_init(); | 97 | voyagergx_serial_init(); |
95 | 98 | ||
99 | printk(KERN_INFO "Renesas Technology Sales RTS7751R2D support.\n"); | ||
96 | } | 100 | } |
101 | |||
102 | /* | ||
103 | * The Machine Vector | ||
104 | */ | ||
105 | struct sh_machine_vector mv_rts7751r2d __initmv = { | ||
106 | .mv_name = "RTS7751R2D", | ||
107 | .mv_setup = rts7751r2d_setup, | ||
108 | .mv_nr_irqs = 72, | ||
109 | |||
110 | .mv_inb = rts7751r2d_inb, | ||
111 | .mv_inw = rts7751r2d_inw, | ||
112 | .mv_inl = rts7751r2d_inl, | ||
113 | .mv_outb = rts7751r2d_outb, | ||
114 | .mv_outw = rts7751r2d_outw, | ||
115 | .mv_outl = rts7751r2d_outl, | ||
116 | |||
117 | .mv_inb_p = rts7751r2d_inb_p, | ||
118 | .mv_inw_p = rts7751r2d_inw, | ||
119 | .mv_inl_p = rts7751r2d_inl, | ||
120 | .mv_outb_p = rts7751r2d_outb_p, | ||
121 | .mv_outw_p = rts7751r2d_outw, | ||
122 | .mv_outl_p = rts7751r2d_outl, | ||
123 | |||
124 | .mv_insb = rts7751r2d_insb, | ||
125 | .mv_insw = rts7751r2d_insw, | ||
126 | .mv_insl = rts7751r2d_insl, | ||
127 | .mv_outsb = rts7751r2d_outsb, | ||
128 | .mv_outsw = rts7751r2d_outsw, | ||
129 | .mv_outsl = rts7751r2d_outsl, | ||
130 | |||
131 | .mv_init_irq = init_rts7751r2d_IRQ, | ||
132 | #ifdef CONFIG_HEARTBEAT | ||
133 | .mv_heartbeat = heartbeat_rts7751r2d, | ||
134 | #endif | ||
135 | .mv_irq_demux = rts7751r2d_irq_demux, | ||
136 | |||
137 | #ifdef CONFIG_USB_SM501 | ||
138 | .mv_consistent_alloc = voyagergx_consistent_alloc, | ||
139 | .mv_consistent_free = voyagergx_consistent_free, | ||
140 | #endif | ||
141 | }; | ||
142 | ALIAS_MV(rts7751r2d) | ||
diff --git a/arch/sh/boards/renesas/systemh/setup.c b/arch/sh/boards/renesas/systemh/setup.c index 433c7c3f35e2..a8467bf90c25 100644 --- a/arch/sh/boards/renesas/systemh/setup.c +++ b/arch/sh/boards/renesas/systemh/setup.c | |||
@@ -20,20 +20,16 @@ | |||
20 | 20 | ||
21 | extern void make_systemh_irq(unsigned int irq); | 21 | extern void make_systemh_irq(unsigned int irq); |
22 | 22 | ||
23 | const char *get_system_type(void) | ||
24 | { | ||
25 | return "7751 SystemH"; | ||
26 | } | ||
27 | |||
28 | /* | 23 | /* |
29 | * Initialize IRQ setting | 24 | * Initialize IRQ setting |
30 | */ | 25 | */ |
31 | void __init init_7751systemh_IRQ(void) | 26 | static void __init sh7751systemh_init_irq(void) |
32 | { | 27 | { |
33 | make_systemh_irq(0xb); /* Ethernet interrupt */ | 28 | make_systemh_irq(0xb); /* Ethernet interrupt */ |
34 | } | 29 | } |
35 | 30 | ||
36 | struct sh_machine_vector mv_7751systemh __initmv = { | 31 | struct sh_machine_vector mv_7751systemh __initmv = { |
32 | .mv_name = "7751 SystemH", | ||
37 | .mv_nr_irqs = 72, | 33 | .mv_nr_irqs = 72, |
38 | 34 | ||
39 | .mv_inb = sh7751systemh_inb, | 35 | .mv_inb = sh7751systemh_inb, |
@@ -57,12 +53,6 @@ struct sh_machine_vector mv_7751systemh __initmv = { | |||
57 | .mv_outsw = sh7751systemh_outsw, | 53 | .mv_outsw = sh7751systemh_outsw, |
58 | .mv_outsl = sh7751systemh_outsl, | 54 | .mv_outsl = sh7751systemh_outsl, |
59 | 55 | ||
60 | .mv_init_irq = init_7751systemh_IRQ, | 56 | .mv_init_irq = sh7751system_init_irq, |
61 | }; | 57 | }; |
62 | ALIAS_MV(7751systemh) | 58 | ALIAS_MV(7751systemh) |
63 | |||
64 | int __init platform_setup(void) | ||
65 | { | ||
66 | return 0; | ||
67 | } | ||
68 | |||