diff options
author | Greg Ungerer <gerg@uclinux.org> | 2012-04-17 01:21:31 -0400 |
---|---|---|
committer | Greg Ungerer <gerg@uclinux.org> | 2012-05-20 07:21:58 -0400 |
commit | daacd5cc255bdba62b1be999c7b77ca1015a79a3 (patch) | |
tree | c7e46f5bf1e7099a511074ad1c6ad3ddaf277da3 /arch/m68k/platform/coldfire | |
parent | f198f9cd857a1a59f94a56fa5a6fbfc437a2bc0a (diff) |
m68knommu: move the 5206 platform code into the common ColdFire code directory
All these separate directories for each ColdFire CPU SoC varient seems like
overkill. The majority of them only contain a single small config file. Move
these into the common ColdFire code directory.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68k/platform/coldfire')
-rw-r--r-- | arch/m68k/platform/coldfire/Makefile | 4 | ||||
-rw-r--r-- | arch/m68k/platform/coldfire/m5206.c | 47 |
2 files changed, 49 insertions, 2 deletions
diff --git a/arch/m68k/platform/coldfire/Makefile b/arch/m68k/platform/coldfire/Makefile index a0815c61dec1..ef729b173eb8 100644 --- a/arch/m68k/platform/coldfire/Makefile +++ b/arch/m68k/platform/coldfire/Makefile | |||
@@ -15,8 +15,8 @@ | |||
15 | asflags-$(CONFIG_FULLDEBUG) := -DDEBUGGER_COMPATIBLE_CACHE=1 | 15 | asflags-$(CONFIG_FULLDEBUG) := -DDEBUGGER_COMPATIBLE_CACHE=1 |
16 | 16 | ||
17 | obj-$(CONFIG_COLDFIRE) += cache.o clk.o device.o dma.o entry.o vectors.o | 17 | obj-$(CONFIG_COLDFIRE) += cache.o clk.o device.o dma.o entry.o vectors.o |
18 | obj-$(CONFIG_M5206) += timers.o intc.o reset.o | 18 | obj-$(CONFIG_M5206) += m5206.o timers.o intc.o reset.o |
19 | obj-$(CONFIG_M5206e) += timers.o intc.o reset.o | 19 | obj-$(CONFIG_M5206e) += m5206.o timers.o intc.o reset.o |
20 | obj-$(CONFIG_M520x) += pit.o intc-simr.o reset.o | 20 | obj-$(CONFIG_M520x) += pit.o intc-simr.o reset.o |
21 | obj-$(CONFIG_M523x) += pit.o dma_timer.o intc-2.o reset.o | 21 | obj-$(CONFIG_M523x) += pit.o dma_timer.o intc-2.o reset.o |
22 | obj-$(CONFIG_M5249) += timers.o intc.o reset.o | 22 | obj-$(CONFIG_M5249) += timers.o intc.o reset.o |
diff --git a/arch/m68k/platform/coldfire/m5206.c b/arch/m68k/platform/coldfire/m5206.c new file mode 100644 index 000000000000..a8b81df653f0 --- /dev/null +++ b/arch/m68k/platform/coldfire/m5206.c | |||
@@ -0,0 +1,47 @@ | |||
1 | /***************************************************************************/ | ||
2 | |||
3 | /* | ||
4 | * linux/arch/m68knommu/platform/5206/config.c | ||
5 | * | ||
6 | * Copyright (C) 1999-2002, Greg Ungerer (gerg@snapgear.com) | ||
7 | * Copyright (C) 2000-2001, Lineo Inc. (www.lineo.com) | ||
8 | */ | ||
9 | |||
10 | /***************************************************************************/ | ||
11 | |||
12 | #include <linux/kernel.h> | ||
13 | #include <linux/param.h> | ||
14 | #include <linux/init.h> | ||
15 | #include <linux/io.h> | ||
16 | #include <asm/machdep.h> | ||
17 | #include <asm/coldfire.h> | ||
18 | #include <asm/mcfsim.h> | ||
19 | #include <asm/mcfgpio.h> | ||
20 | |||
21 | /***************************************************************************/ | ||
22 | |||
23 | struct mcf_gpio_chip mcf_gpio_chips[] = { | ||
24 | MCFGPS(PP, 0, 8, MCFSIM_PADDR, MCFSIM_PADAT, MCFSIM_PADAT), | ||
25 | }; | ||
26 | |||
27 | unsigned int mcf_gpio_chips_size = ARRAY_SIZE(mcf_gpio_chips); | ||
28 | |||
29 | /***************************************************************************/ | ||
30 | |||
31 | void __init config_BSP(char *commandp, int size) | ||
32 | { | ||
33 | #if defined(CONFIG_NETtel) | ||
34 | /* Copy command line from FLASH to local buffer... */ | ||
35 | memcpy(commandp, (char *) 0xf0004000, size); | ||
36 | commandp[size-1] = 0; | ||
37 | #endif /* CONFIG_NETtel */ | ||
38 | |||
39 | mach_sched_init = hw_timer_init; | ||
40 | |||
41 | /* Only support the external interrupts on their primary level */ | ||
42 | mcf_mapirq2imr(25, MCFINTC_EINT1); | ||
43 | mcf_mapirq2imr(28, MCFINTC_EINT4); | ||
44 | mcf_mapirq2imr(31, MCFINTC_EINT7); | ||
45 | } | ||
46 | |||
47 | /***************************************************************************/ | ||