diff options
author | Greg Ungerer <gerg@uclinux.org> | 2010-11-01 22:05:29 -0400 |
---|---|---|
committer | Greg Ungerer <gerg@uclinux.org> | 2011-01-05 00:19:17 -0500 |
commit | 5b2e6555ac3eb58a4e5eb5020471df08f0c42c01 (patch) | |
tree | 38514c0431fce8567a5ae74ea76e99ef910891d9 /arch/m68k/include/asm | |
parent | 9c68015b149d45a35114b4a1ed44c21fa66bc430 (diff) |
m68knommu: make Coldfire 548x support more generic
The ColdFire 547x family of processors is very similar to the ColdFire
548x series. Almost all of the support for them is the same. Make the
code supporting the 548x more gneric, so it will be capable of
supporting both families.
For the most part this is a renaming excerise to make the support
code more obviously apply to both families.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68k/include/asm')
-rw-r--r-- | arch/m68k/include/asm/cacheflush_no.h | 2 | ||||
-rw-r--r-- | arch/m68k/include/asm/coldfire.h | 2 | ||||
-rw-r--r-- | arch/m68k/include/asm/gpio.h | 2 | ||||
-rw-r--r-- | arch/m68k/include/asm/m54xxacr.h | 2 | ||||
-rw-r--r-- | arch/m68k/include/asm/m54xxgpt.h (renamed from arch/m68k/include/asm/m548xgpt.h) | 10 | ||||
-rw-r--r-- | arch/m68k/include/asm/m54xxsim.h (renamed from arch/m68k/include/asm/m548xsim.h) | 8 | ||||
-rw-r--r-- | arch/m68k/include/asm/mcfcache.h | 4 | ||||
-rw-r--r-- | arch/m68k/include/asm/mcfsim.h | 4 | ||||
-rw-r--r-- | arch/m68k/include/asm/mcfuart.h | 12 |
9 files changed, 23 insertions, 23 deletions
diff --git a/arch/m68k/include/asm/cacheflush_no.h b/arch/m68k/include/asm/cacheflush_no.h index 29f76204ce1d..9246392e1372 100644 --- a/arch/m68k/include/asm/cacheflush_no.h +++ b/arch/m68k/include/asm/cacheflush_no.h | |||
@@ -5,7 +5,7 @@ | |||
5 | * (C) Copyright 2000-2004, Greg Ungerer <gerg@snapgear.com> | 5 | * (C) Copyright 2000-2004, Greg Ungerer <gerg@snapgear.com> |
6 | */ | 6 | */ |
7 | #include <linux/mm.h> | 7 | #include <linux/mm.h> |
8 | #if defined(CONFIG_M5407) || defined(CONFIG_M548x) | 8 | #if defined(CONFIG_M5407) || defined(CONFIG_M54xx) |
9 | #include <asm/m54xxacr.h> | 9 | #include <asm/m54xxacr.h> |
10 | #endif | 10 | #endif |
11 | 11 | ||
diff --git a/arch/m68k/include/asm/coldfire.h b/arch/m68k/include/asm/coldfire.h index 3b0a34d0fe33..213028cbe110 100644 --- a/arch/m68k/include/asm/coldfire.h +++ b/arch/m68k/include/asm/coldfire.h | |||
@@ -32,7 +32,7 @@ | |||
32 | */ | 32 | */ |
33 | #define MCF_MBAR 0x10000000 | 33 | #define MCF_MBAR 0x10000000 |
34 | #define MCF_MBAR2 0x80000000 | 34 | #define MCF_MBAR2 0x80000000 |
35 | #if defined(CONFIG_M548x) | 35 | #if defined(CONFIG_M54xx) |
36 | #define MCF_IPSBAR MCF_MBAR | 36 | #define MCF_IPSBAR MCF_MBAR |
37 | #elif defined(CONFIG_M520x) | 37 | #elif defined(CONFIG_M520x) |
38 | #define MCF_IPSBAR 0xFC000000 | 38 | #define MCF_IPSBAR 0xFC000000 |
diff --git a/arch/m68k/include/asm/gpio.h b/arch/m68k/include/asm/gpio.h index 1b57adbafad5..c64c7b74cf86 100644 --- a/arch/m68k/include/asm/gpio.h +++ b/arch/m68k/include/asm/gpio.h | |||
@@ -37,7 +37,7 @@ | |||
37 | #if defined(CONFIG_M5206) || defined(CONFIG_M5206e) || \ | 37 | #if defined(CONFIG_M5206) || defined(CONFIG_M5206e) || \ |
38 | defined(CONFIG_M520x) || defined(CONFIG_M523x) || \ | 38 | defined(CONFIG_M520x) || defined(CONFIG_M523x) || \ |
39 | defined(CONFIG_M527x) || defined(CONFIG_M528x) || \ | 39 | defined(CONFIG_M527x) || defined(CONFIG_M528x) || \ |
40 | defined(CONFIG_M532x) || defined(CONFIG_M548x) | 40 | defined(CONFIG_M532x) || defined(CONFIG_M54xx) |
41 | 41 | ||
42 | /* These parts have GPIO organized by 8 bit ports */ | 42 | /* These parts have GPIO organized by 8 bit ports */ |
43 | 43 | ||
diff --git a/arch/m68k/include/asm/m54xxacr.h b/arch/m68k/include/asm/m54xxacr.h index 7d28da4d622a..76d64906aa62 100644 --- a/arch/m68k/include/asm/m54xxacr.h +++ b/arch/m68k/include/asm/m54xxacr.h | |||
@@ -45,7 +45,7 @@ | |||
45 | #define ICACHE_SIZE 0x4000 /* instruction - 16k */ | 45 | #define ICACHE_SIZE 0x4000 /* instruction - 16k */ |
46 | #define DCACHE_SIZE 0x2000 /* data - 8k */ | 46 | #define DCACHE_SIZE 0x2000 /* data - 8k */ |
47 | 47 | ||
48 | #elif defined(CONFIG_M548x) | 48 | #elif defined(CONFIG_M54xx) |
49 | 49 | ||
50 | #define ICACHE_SIZE 0x8000 /* instruction - 32k */ | 50 | #define ICACHE_SIZE 0x8000 /* instruction - 32k */ |
51 | #define DCACHE_SIZE 0x8000 /* data - 32k */ | 51 | #define DCACHE_SIZE 0x8000 /* data - 32k */ |
diff --git a/arch/m68k/include/asm/m548xgpt.h b/arch/m68k/include/asm/m54xxgpt.h index c8ef158a1c4e..47ae5cfec66b 100644 --- a/arch/m68k/include/asm/m548xgpt.h +++ b/arch/m68k/include/asm/m54xxgpt.h | |||
@@ -1,13 +1,13 @@ | |||
1 | /* | 1 | /* |
2 | * File: m548xgpt.h | 2 | * File: m54xxgpt.h |
3 | * Purpose: Register and bit definitions for the MCF548X | 3 | * Purpose: Register and bit definitions for the MCF54XX |
4 | * | 4 | * |
5 | * Notes: | 5 | * Notes: |
6 | * | 6 | * |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #ifndef m548xgpt_h | 9 | #ifndef m54xxgpt_h |
10 | #define m548xgpt_h | 10 | #define m54xxgpt_h |
11 | 11 | ||
12 | /********************************************************************* | 12 | /********************************************************************* |
13 | * | 13 | * |
@@ -85,4 +85,4 @@ | |||
85 | 85 | ||
86 | /********************************************************************/ | 86 | /********************************************************************/ |
87 | 87 | ||
88 | #endif /* m548xgpt_h */ | 88 | #endif /* m54xxgpt_h */ |
diff --git a/arch/m68k/include/asm/m548xsim.h b/arch/m68k/include/asm/m54xxsim.h index 149135ef30d2..c46826c900b3 100644 --- a/arch/m68k/include/asm/m548xsim.h +++ b/arch/m68k/include/asm/m54xxsim.h | |||
@@ -1,9 +1,9 @@ | |||
1 | /* | 1 | /* |
2 | * m548xsim.h -- ColdFire 547x/548x System Integration Unit support. | 2 | * m54xxsim.h -- ColdFire 547x/548x System Integration Unit support. |
3 | */ | 3 | */ |
4 | 4 | ||
5 | #ifndef m548xsim_h | 5 | #ifndef m54xxsim_h |
6 | #define m548xsim_h | 6 | #define m54xxsim_h |
7 | 7 | ||
8 | #define MCFINT_VECBASE 64 | 8 | #define MCFINT_VECBASE 64 |
9 | 9 | ||
@@ -52,4 +52,4 @@ | |||
52 | #define MCF_PAR_PSC_RTS_RTS (0x30) | 52 | #define MCF_PAR_PSC_RTS_RTS (0x30) |
53 | #define MCF_PAR_PSC_CANRX (0x40) | 53 | #define MCF_PAR_PSC_CANRX (0x40) |
54 | 54 | ||
55 | #endif /* m548xsim_h */ | 55 | #endif /* m54xxsim_h */ |
diff --git a/arch/m68k/include/asm/mcfcache.h b/arch/m68k/include/asm/mcfcache.h index 7acb406d601b..1b66018461b8 100644 --- a/arch/m68k/include/asm/mcfcache.h +++ b/arch/m68k/include/asm/mcfcache.h | |||
@@ -107,7 +107,7 @@ | |||
107 | .endm | 107 | .endm |
108 | #endif /* CONFIG_M532x */ | 108 | #endif /* CONFIG_M532x */ |
109 | 109 | ||
110 | #if defined(CONFIG_M5407) || defined(CONFIG_M548x) | 110 | #if defined(CONFIG_M5407) || defined(CONFIG_M54xx) |
111 | 111 | ||
112 | #include <asm/m54xxacr.h> | 112 | #include <asm/m54xxacr.h> |
113 | 113 | ||
@@ -131,7 +131,7 @@ | |||
131 | movec %d0,%CACR | 131 | movec %d0,%CACR |
132 | nop | 132 | nop |
133 | .endm | 133 | .endm |
134 | #endif /* CONFIG_M5407 || CONFIG_M548x */ | 134 | #endif /* CONFIG_M5407 || CONFIG_M54xx */ |
135 | 135 | ||
136 | #if defined(CONFIG_M520x) | 136 | #if defined(CONFIG_M520x) |
137 | .macro CACHE_ENABLE | 137 | .macro CACHE_ENABLE |
diff --git a/arch/m68k/include/asm/mcfsim.h b/arch/m68k/include/asm/mcfsim.h index 6901fd68165b..ebd0304054ad 100644 --- a/arch/m68k/include/asm/mcfsim.h +++ b/arch/m68k/include/asm/mcfsim.h | |||
@@ -41,8 +41,8 @@ | |||
41 | #elif defined(CONFIG_M5407) | 41 | #elif defined(CONFIG_M5407) |
42 | #include <asm/m5407sim.h> | 42 | #include <asm/m5407sim.h> |
43 | #include <asm/mcfintc.h> | 43 | #include <asm/mcfintc.h> |
44 | #elif defined(CONFIG_M548x) | 44 | #elif defined(CONFIG_M54xx) |
45 | #include <asm/m548xsim.h> | 45 | #include <asm/m54xxsim.h> |
46 | #endif | 46 | #endif |
47 | 47 | ||
48 | /****************************************************************************/ | 48 | /****************************************************************************/ |
diff --git a/arch/m68k/include/asm/mcfuart.h b/arch/m68k/include/asm/mcfuart.h index db72e2b889ca..c67dacad7c1c 100644 --- a/arch/m68k/include/asm/mcfuart.h +++ b/arch/m68k/include/asm/mcfuart.h | |||
@@ -47,11 +47,11 @@ | |||
47 | #define MCFUART_BASE1 0xfc060000 /* Base address of UART1 */ | 47 | #define MCFUART_BASE1 0xfc060000 /* Base address of UART1 */ |
48 | #define MCFUART_BASE2 0xfc064000 /* Base address of UART2 */ | 48 | #define MCFUART_BASE2 0xfc064000 /* Base address of UART2 */ |
49 | #define MCFUART_BASE3 0xfc068000 /* Base address of UART3 */ | 49 | #define MCFUART_BASE3 0xfc068000 /* Base address of UART3 */ |
50 | #elif defined(CONFIG_M548x) | 50 | #elif defined(CONFIG_M54xx) |
51 | #define MCFUART_BASE1 0x8600 /* on M548x */ | 51 | #define MCFUART_BASE1 0x8600 /* on M54xx */ |
52 | #define MCFUART_BASE2 0x8700 /* on M548x */ | 52 | #define MCFUART_BASE2 0x8700 /* on M54xx */ |
53 | #define MCFUART_BASE3 0x8800 /* on M548x */ | 53 | #define MCFUART_BASE3 0x8800 /* on M54xx */ |
54 | #define MCFUART_BASE4 0x8900 /* on M548x */ | 54 | #define MCFUART_BASE4 0x8900 /* on M54xx */ |
55 | #endif | 55 | #endif |
56 | 56 | ||
57 | 57 | ||
@@ -217,7 +217,7 @@ struct mcf_platform_uart { | |||
217 | #define MCFUART_URF_RXS 0xc0 /* Receiver status */ | 217 | #define MCFUART_URF_RXS 0xc0 /* Receiver status */ |
218 | #endif | 218 | #endif |
219 | 219 | ||
220 | #if defined(CONFIG_M548x) | 220 | #if defined(CONFIG_M54xx) |
221 | #define MCFUART_TXFIFOSIZE 512 | 221 | #define MCFUART_TXFIFOSIZE 512 |
222 | #elif defined(CONFIG_M5272) | 222 | #elif defined(CONFIG_M5272) |
223 | #define MCFUART_TXFIFOSIZE 25 | 223 | #define MCFUART_TXFIFOSIZE 25 |