diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-shmobile/Kconfig | 14 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/Makefile | 2 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/board-ap4evb.c | 127 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/include/mach/common.h | 4 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/setup-sh7372.c | 241 |
5 files changed, 388 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index 160b2eef6d81..06b3b6162ff7 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig | |||
@@ -18,6 +18,14 @@ config ARCH_SH7377 | |||
18 | select GENERIC_TIME | 18 | select GENERIC_TIME |
19 | select GENERIC_CLOCKEVENTS | 19 | select GENERIC_CLOCKEVENTS |
20 | 20 | ||
21 | config ARCH_SH7372 | ||
22 | bool "SH-Mobile AP4 (SH7372)" | ||
23 | select CPU_V7 | ||
24 | select HAVE_CLK | ||
25 | select COMMON_CLKDEV | ||
26 | select GENERIC_TIME | ||
27 | select GENERIC_CLOCKEVENTS | ||
28 | |||
21 | comment "SH-Mobile Board Type" | 29 | comment "SH-Mobile Board Type" |
22 | 30 | ||
23 | config MACH_G3EVM | 31 | config MACH_G3EVM |
@@ -28,6 +36,10 @@ config MACH_G4EVM | |||
28 | bool "G4EVM board" | 36 | bool "G4EVM board" |
29 | depends on ARCH_SH7377 | 37 | depends on ARCH_SH7377 |
30 | 38 | ||
39 | config MACH_AP4EVB | ||
40 | bool "AP4EVB board" | ||
41 | depends on ARCH_SH7372 | ||
42 | |||
31 | comment "SH-Mobile System Configuration" | 43 | comment "SH-Mobile System Configuration" |
32 | 44 | ||
33 | menu "Memory configuration" | 45 | menu "Memory configuration" |
@@ -36,6 +48,7 @@ config MEMORY_START | |||
36 | hex "Physical memory start address" | 48 | hex "Physical memory start address" |
37 | default "0x50000000" if MACH_G3EVM | 49 | default "0x50000000" if MACH_G3EVM |
38 | default "0x40000000" if MACH_G4EVM | 50 | default "0x40000000" if MACH_G4EVM |
51 | default "0x40000000" if MACH_AP4EVB | ||
39 | default "0x00000000" | 52 | default "0x00000000" |
40 | ---help--- | 53 | ---help--- |
41 | Tweak this only when porting to a new machine which does not | 54 | Tweak this only when porting to a new machine which does not |
@@ -46,6 +59,7 @@ config MEMORY_SIZE | |||
46 | hex "Physical memory size" | 59 | hex "Physical memory size" |
47 | default "0x08000000" if MACH_G3EVM | 60 | default "0x08000000" if MACH_G3EVM |
48 | default "0x08000000" if MACH_G4EVM | 61 | default "0x08000000" if MACH_G4EVM |
62 | default "0x10000000" if MACH_AP4EVB | ||
49 | default "0x04000000" | 63 | default "0x04000000" |
50 | help | 64 | help |
51 | This sets the default memory size assumed by your kernel. It can | 65 | This sets the default memory size assumed by your kernel. It can |
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile index 3f91268705a3..88893dbf7107 100644 --- a/arch/arm/mach-shmobile/Makefile +++ b/arch/arm/mach-shmobile/Makefile | |||
@@ -8,7 +8,9 @@ obj-y := timer.o | |||
8 | # CPU objects | 8 | # CPU objects |
9 | obj-$(CONFIG_ARCH_SH7367) += setup-sh7367.o clock-sh7367.o | 9 | obj-$(CONFIG_ARCH_SH7367) += setup-sh7367.o clock-sh7367.o |
10 | obj-$(CONFIG_ARCH_SH7377) += setup-sh7377.o clock-sh7367.o | 10 | obj-$(CONFIG_ARCH_SH7377) += setup-sh7377.o clock-sh7367.o |
11 | obj-$(CONFIG_ARCH_SH7372) += setup-sh7372.o clock-sh7367.o | ||
11 | 12 | ||
12 | # Board objects | 13 | # Board objects |
13 | obj-$(CONFIG_MACH_G3EVM) += board-g3evm.o | 14 | obj-$(CONFIG_MACH_G3EVM) += board-g3evm.o |
14 | obj-$(CONFIG_MACH_G4EVM) += board-g4evm.o | 15 | obj-$(CONFIG_MACH_G4EVM) += board-g4evm.o |
16 | obj-$(CONFIG_MACH_AP4EVB) += board-ap4evb.o | ||
diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c new file mode 100644 index 000000000000..a8d815c96232 --- /dev/null +++ b/arch/arm/mach-shmobile/board-ap4evb.c | |||
@@ -0,0 +1,127 @@ | |||
1 | /* | ||
2 | * AP4EVB board support | ||
3 | * | ||
4 | * Copyright (C) 2010 Magnus Damm | ||
5 | * Copyright (C) 2008 Yoshihiro Shimoda | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License as published by | ||
9 | * the Free Software Foundation; version 2 of the License. | ||
10 | * | ||
11 | * This program is distributed in the hope that it will be useful, | ||
12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
14 | * GNU General Public License for more details. | ||
15 | * | ||
16 | * You should have received a copy of the GNU General Public License | ||
17 | * along with this program; if not, write to the Free Software | ||
18 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | ||
19 | */ | ||
20 | #include <linux/kernel.h> | ||
21 | #include <linux/init.h> | ||
22 | #include <linux/interrupt.h> | ||
23 | #include <linux/irq.h> | ||
24 | #include <linux/platform_device.h> | ||
25 | #include <linux/delay.h> | ||
26 | #include <linux/mtd/mtd.h> | ||
27 | #include <linux/mtd/partitions.h> | ||
28 | #include <linux/mtd/physmap.h> | ||
29 | #include <linux/io.h> | ||
30 | #include <mach/common.h> | ||
31 | #include <asm/mach-types.h> | ||
32 | #include <asm/mach/arch.h> | ||
33 | #include <asm/mach/map.h> | ||
34 | |||
35 | static struct mtd_partition nor_flash_partitions[] = { | ||
36 | { | ||
37 | .name = "loader", | ||
38 | .offset = 0x00000000, | ||
39 | .size = 512 * 1024, | ||
40 | }, | ||
41 | { | ||
42 | .name = "bootenv", | ||
43 | .offset = MTDPART_OFS_APPEND, | ||
44 | .size = 512 * 1024, | ||
45 | }, | ||
46 | { | ||
47 | .name = "kernel_ro", | ||
48 | .offset = MTDPART_OFS_APPEND, | ||
49 | .size = 8 * 1024 * 1024, | ||
50 | .mask_flags = MTD_WRITEABLE, | ||
51 | }, | ||
52 | { | ||
53 | .name = "kernel", | ||
54 | .offset = MTDPART_OFS_APPEND, | ||
55 | .size = 8 * 1024 * 1024, | ||
56 | }, | ||
57 | { | ||
58 | .name = "data", | ||
59 | .offset = MTDPART_OFS_APPEND, | ||
60 | .size = MTDPART_SIZ_FULL, | ||
61 | }, | ||
62 | }; | ||
63 | |||
64 | static struct physmap_flash_data nor_flash_data = { | ||
65 | .width = 2, | ||
66 | .parts = nor_flash_partitions, | ||
67 | .nr_parts = ARRAY_SIZE(nor_flash_partitions), | ||
68 | }; | ||
69 | |||
70 | static struct resource nor_flash_resources[] = { | ||
71 | [0] = { | ||
72 | .start = 0x00000000, | ||
73 | .end = 0x08000000 - 1, | ||
74 | .flags = IORESOURCE_MEM, | ||
75 | } | ||
76 | }; | ||
77 | |||
78 | static struct platform_device nor_flash_device = { | ||
79 | .name = "physmap-flash", | ||
80 | .dev = { | ||
81 | .platform_data = &nor_flash_data, | ||
82 | }, | ||
83 | .num_resources = ARRAY_SIZE(nor_flash_resources), | ||
84 | .resource = nor_flash_resources, | ||
85 | }; | ||
86 | |||
87 | |||
88 | static struct platform_device *ap4evb_devices[] __initdata = { | ||
89 | &nor_flash_device, | ||
90 | }; | ||
91 | |||
92 | static struct map_desc ap4evb_io_desc[] __initdata = { | ||
93 | /* create a 1:1 entity map for 0xe6xxxxxx | ||
94 | * used by CPGA, INTC and PFC. | ||
95 | */ | ||
96 | { | ||
97 | .virtual = 0xe6000000, | ||
98 | .pfn = __phys_to_pfn(0xe6000000), | ||
99 | .length = 256 << 20, | ||
100 | .type = MT_DEVICE_NONSHARED | ||
101 | }, | ||
102 | }; | ||
103 | |||
104 | static void __init ap4evb_map_io(void) | ||
105 | { | ||
106 | iotable_init(ap4evb_io_desc, ARRAY_SIZE(ap4evb_io_desc)); | ||
107 | |||
108 | /* setup early devices and clocks here as well */ | ||
109 | sh7372_add_early_devices(); | ||
110 | sh7367_clock_init(); /* use g3 clocks for now */ | ||
111 | } | ||
112 | |||
113 | static void __init ap4evb_init(void) | ||
114 | { | ||
115 | sh7372_add_standard_devices(); | ||
116 | |||
117 | platform_add_devices(ap4evb_devices, ARRAY_SIZE(ap4evb_devices)); | ||
118 | } | ||
119 | |||
120 | MACHINE_START(AP4EVB, "ap4evb") | ||
121 | .phys_io = 0xe6000000, | ||
122 | .io_pg_offst = ((0xe6000000) >> 18) & 0xfffc, | ||
123 | .map_io = ap4evb_map_io, | ||
124 | .init_irq = sh7372_init_irq, | ||
125 | .init_machine = ap4evb_init, | ||
126 | .timer = &shmobile_timer, | ||
127 | MACHINE_END | ||
diff --git a/arch/arm/mach-shmobile/include/mach/common.h b/arch/arm/mach-shmobile/include/mach/common.h index 3595d24b7c8b..a12eb4d75f63 100644 --- a/arch/arm/mach-shmobile/include/mach/common.h +++ b/arch/arm/mach-shmobile/include/mach/common.h | |||
@@ -12,4 +12,8 @@ extern void sh7377_init_irq(void); | |||
12 | extern void sh7377_add_early_devices(void); | 12 | extern void sh7377_add_early_devices(void); |
13 | extern void sh7377_add_standard_devices(void); | 13 | extern void sh7377_add_standard_devices(void); |
14 | 14 | ||
15 | extern void sh7372_init_irq(void); | ||
16 | extern void sh7372_add_early_devices(void); | ||
17 | extern void sh7372_add_standard_devices(void); | ||
18 | |||
15 | #endif /* __ARCH_MACH_COMMON_H */ | 19 | #endif /* __ARCH_MACH_COMMON_H */ |
diff --git a/arch/arm/mach-shmobile/setup-sh7372.c b/arch/arm/mach-shmobile/setup-sh7372.c new file mode 100644 index 000000000000..db972e61c071 --- /dev/null +++ b/arch/arm/mach-shmobile/setup-sh7372.c | |||
@@ -0,0 +1,241 @@ | |||
1 | /* | ||
2 | * sh7372 processor support | ||
3 | * | ||
4 | * Copyright (C) 2010 Magnus Damm | ||
5 | * Copyright (C) 2008 Yoshihiro Shimoda | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License as published by | ||
9 | * the Free Software Foundation; version 2 of the License. | ||
10 | * | ||
11 | * This program is distributed in the hope that it will be useful, | ||
12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
14 | * GNU General Public License for more details. | ||
15 | * | ||
16 | * You should have received a copy of the GNU General Public License | ||
17 | * along with this program; if not, write to the Free Software | ||
18 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | ||
19 | */ | ||
20 | #include <linux/kernel.h> | ||
21 | #include <linux/init.h> | ||
22 | #include <linux/interrupt.h> | ||
23 | #include <linux/irq.h> | ||
24 | #include <linux/platform_device.h> | ||
25 | #include <linux/delay.h> | ||
26 | #include <linux/input.h> | ||
27 | #include <linux/io.h> | ||
28 | #include <linux/serial_sci.h> | ||
29 | #include <linux/sh_intc.h> | ||
30 | #include <linux/sh_timer.h> | ||
31 | #include <mach/hardware.h> | ||
32 | #include <asm/mach-types.h> | ||
33 | #include <asm/mach/arch.h> | ||
34 | |||
35 | static struct plat_sci_port scif0_platform_data = { | ||
36 | .mapbase = 0xe6c40000, | ||
37 | .flags = UPF_BOOT_AUTOCONF, | ||
38 | .type = PORT_SCIF, | ||
39 | .irqs = { 80, 80, 80, 80 }, | ||
40 | }; | ||
41 | |||
42 | static struct platform_device scif0_device = { | ||
43 | .name = "sh-sci", | ||
44 | .id = 0, | ||
45 | .dev = { | ||
46 | .platform_data = &scif0_platform_data, | ||
47 | }, | ||
48 | }; | ||
49 | |||
50 | static struct plat_sci_port scif1_platform_data = { | ||
51 | .mapbase = 0xe6c50000, | ||
52 | .flags = UPF_BOOT_AUTOCONF, | ||
53 | .type = PORT_SCIF, | ||
54 | .irqs = { 81, 81, 81, 81 }, | ||
55 | }; | ||
56 | |||
57 | static struct platform_device scif1_device = { | ||
58 | .name = "sh-sci", | ||
59 | .id = 1, | ||
60 | .dev = { | ||
61 | .platform_data = &scif1_platform_data, | ||
62 | }, | ||
63 | }; | ||
64 | |||
65 | static struct plat_sci_port scif2_platform_data = { | ||
66 | .mapbase = 0xe6c60000, | ||
67 | .flags = UPF_BOOT_AUTOCONF, | ||
68 | .type = PORT_SCIF, | ||
69 | .irqs = { 82, 82, 82, 82 }, | ||
70 | }; | ||
71 | |||
72 | static struct platform_device scif2_device = { | ||
73 | .name = "sh-sci", | ||
74 | .id = 2, | ||
75 | .dev = { | ||
76 | .platform_data = &scif2_platform_data, | ||
77 | }, | ||
78 | }; | ||
79 | |||
80 | static struct plat_sci_port scif3_platform_data = { | ||
81 | .mapbase = 0xe6c70000, | ||
82 | .flags = UPF_BOOT_AUTOCONF, | ||
83 | .type = PORT_SCIF, | ||
84 | .irqs = { 83, 83, 83, 83 }, | ||
85 | }; | ||
86 | |||
87 | static struct platform_device scif3_device = { | ||
88 | .name = "sh-sci", | ||
89 | .id = 3, | ||
90 | .dev = { | ||
91 | .platform_data = &scif3_platform_data, | ||
92 | }, | ||
93 | }; | ||
94 | |||
95 | static struct plat_sci_port scif4_platform_data = { | ||
96 | .mapbase = 0xe6c80000, | ||
97 | .flags = UPF_BOOT_AUTOCONF, | ||
98 | .type = PORT_SCIF, | ||
99 | .irqs = { 89, 89, 89, 89 }, | ||
100 | }; | ||
101 | |||
102 | static struct platform_device scif4_device = { | ||
103 | .name = "sh-sci", | ||
104 | .id = 4, | ||
105 | .dev = { | ||
106 | .platform_data = &scif4_platform_data, | ||
107 | }, | ||
108 | }; | ||
109 | |||
110 | static struct plat_sci_port scif5_platform_data = { | ||
111 | .mapbase = 0xe6cb0000, | ||
112 | .flags = UPF_BOOT_AUTOCONF, | ||
113 | .type = PORT_SCIF, | ||
114 | .irqs = { 90, 90, 90, 90 }, | ||
115 | }; | ||
116 | |||
117 | static struct platform_device scif5_device = { | ||
118 | .name = "sh-sci", | ||
119 | .id = 5, | ||
120 | .dev = { | ||
121 | .platform_data = &scif5_platform_data, | ||
122 | }, | ||
123 | }; | ||
124 | |||
125 | static struct plat_sci_port scif6_platform_data = { | ||
126 | .mapbase = 0xe6c30000, | ||
127 | .flags = UPF_BOOT_AUTOCONF, | ||
128 | .type = PORT_SCIF, | ||
129 | .irqs = { 91, 91, 91, 91 }, | ||
130 | }; | ||
131 | |||
132 | static struct platform_device scif6_device = { | ||
133 | .name = "sh-sci", | ||
134 | .id = 6, | ||
135 | .dev = { | ||
136 | .platform_data = &scif6_platform_data, | ||
137 | }, | ||
138 | }; | ||
139 | |||
140 | static struct sh_timer_config cmt10_platform_data = { | ||
141 | .name = "CMT10", | ||
142 | .channel_offset = 0x10, | ||
143 | .timer_bit = 0, | ||
144 | .clk = "r_clk", | ||
145 | .clockevent_rating = 125, | ||
146 | .clocksource_rating = 125, | ||
147 | }; | ||
148 | |||
149 | static struct resource cmt10_resources[] = { | ||
150 | [0] = { | ||
151 | .name = "CMT10", | ||
152 | .start = 0xe6138010, | ||
153 | .end = 0xe613801b, | ||
154 | .flags = IORESOURCE_MEM, | ||
155 | }, | ||
156 | [1] = { | ||
157 | .start = 72, | ||
158 | .flags = IORESOURCE_IRQ, | ||
159 | }, | ||
160 | }; | ||
161 | |||
162 | static struct platform_device cmt10_device = { | ||
163 | .name = "sh_cmt", | ||
164 | .id = 10, | ||
165 | .dev = { | ||
166 | .platform_data = &cmt10_platform_data, | ||
167 | }, | ||
168 | .resource = cmt10_resources, | ||
169 | .num_resources = ARRAY_SIZE(cmt10_resources), | ||
170 | }; | ||
171 | |||
172 | static struct platform_device *sh7372_early_devices[] __initdata = { | ||
173 | &scif0_device, | ||
174 | &scif1_device, | ||
175 | &scif2_device, | ||
176 | &scif3_device, | ||
177 | &scif4_device, | ||
178 | &scif5_device, | ||
179 | &scif6_device, | ||
180 | &cmt10_device, | ||
181 | }; | ||
182 | |||
183 | void __init sh7372_add_standard_devices(void) | ||
184 | { | ||
185 | platform_add_devices(sh7372_early_devices, | ||
186 | ARRAY_SIZE(sh7372_early_devices)); | ||
187 | } | ||
188 | |||
189 | #define SMSTPCR3 0xe615013c | ||
190 | #define SMSTPCR3_CMT1 (1 << 29) | ||
191 | |||
192 | void __init sh7372_add_early_devices(void) | ||
193 | { | ||
194 | /* enable clock to CMT1 */ | ||
195 | __raw_writel(__raw_readl(SMSTPCR3) & ~SMSTPCR3_CMT1, SMSTPCR3); | ||
196 | |||
197 | early_platform_add_devices(sh7372_early_devices, | ||
198 | ARRAY_SIZE(sh7372_early_devices)); | ||
199 | } | ||
200 | |||
201 | enum { | ||
202 | UNUSED = 0, | ||
203 | |||
204 | /* interrupt sources INTCA */ | ||
205 | |||
206 | SCIFA0, SCIFA1, SCIFA2, SCIFA3, SCIFA4, SCIFA5, SCIFB, | ||
207 | CMT10, | ||
208 | }; | ||
209 | |||
210 | static struct intc_vect vectors[] = { | ||
211 | INTC_VECT(CMT10, 0xb00), | ||
212 | INTC_VECT(SCIFA0, 0xc00), INTC_VECT(SCIFA1, 0xc20), | ||
213 | INTC_VECT(SCIFA2, 0xc40), INTC_VECT(SCIFA3, 0xc60), | ||
214 | INTC_VECT(SCIFA4, 0xd20), INTC_VECT(SCIFA5, 0xd40), | ||
215 | INTC_VECT(SCIFB, 0xd60), | ||
216 | }; | ||
217 | |||
218 | static struct intc_mask_reg mask_registers[] = { | ||
219 | { 0xe6940094, 0xe69400d4, 8, /* IMR5A / IMCR5A */ | ||
220 | { 0, 0, 0, 0, SCIFA3, SCIFA2, SCIFA1, SCIFA0 } }, | ||
221 | { 0xe6940098, 0xe69400d8, 8, /* IMR6A / IMCR6A */ | ||
222 | { SCIFB, SCIFA5, SCIFA4, 0, 0, 0, 0, 0 } }, | ||
223 | { 0xe69400a4, 0xe69400e4, 8, /* IMR9A / IMCR9A */ | ||
224 | { 0, 0, 0, CMT10, 0, 0, 0, 0 } }, | ||
225 | }; | ||
226 | |||
227 | static struct intc_prio_reg prio_registers[] = { | ||
228 | { 0xe6940014, 0, 16, 4, /* IPRFA */ { 0, 0, 0, CMT10 } }, | ||
229 | { 0xe6940018, 0, 16, 4, /* IPRGA */ { SCIFA0, SCIFA1, | ||
230 | SCIFA2, SCIFA3 } }, | ||
231 | { 0xe6940020, 0, 16, 4, /* IPRIA */ { 0, SCIFA4, 0, 0 } }, | ||
232 | { 0xe6940034, 0, 16, 4, /* IPRNA */ { SCIFB, SCIFA5, 0, 0 } }, | ||
233 | }; | ||
234 | |||
235 | static DECLARE_INTC_DESC(intc_desc, "sh7372", vectors, NULL, mask_registers, | ||
236 | prio_registers, NULL); | ||
237 | |||
238 | void __init sh7372_init_irq(void) | ||
239 | { | ||
240 | register_intc_controller(&intc_desc); | ||
241 | } | ||