aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/asm-m68knommu/cacheflush.h2
-rw-r--r--include/asm-m68knommu/mcfcache.h2
-rw-r--r--include/asm-m68knommu/mcfuart.h3
3 files changed, 3 insertions, 4 deletions
diff --git a/include/asm-m68knommu/cacheflush.h b/include/asm-m68knommu/cacheflush.h
index 163dcb1a9689..29bc0aad2ebc 100644
--- a/include/asm-m68knommu/cacheflush.h
+++ b/include/asm-m68knommu/cacheflush.h
@@ -53,7 +53,7 @@ static inline void __flush_cache_all(void)
53#endif /* CONFIG_M5407 */ 53#endif /* CONFIG_M5407 */
54#if defined(CONFIG_M527x) || defined(CONFIG_M528x) 54#if defined(CONFIG_M527x) || defined(CONFIG_M528x)
55 __asm__ __volatile__ ( 55 __asm__ __volatile__ (
56 "movel #0x81400100, %%d0\n\t" 56 "movel #0x81000200, %%d0\n\t"
57 "movec %%d0, %%CACR\n\t" 57 "movec %%d0, %%CACR\n\t"
58 "nop\n\t" 58 "nop\n\t"
59 : : : "d0" ); 59 : : : "d0" );
diff --git a/include/asm-m68knommu/mcfcache.h b/include/asm-m68knommu/mcfcache.h
index 7b61a8a529f5..c042634fadaa 100644
--- a/include/asm-m68knommu/mcfcache.h
+++ b/include/asm-m68knommu/mcfcache.h
@@ -60,7 +60,7 @@
60 nop 60 nop
61 movel #0x0000c020, %d0 /* Set SDRAM cached only */ 61 movel #0x0000c020, %d0 /* Set SDRAM cached only */
62 movec %d0, %ACR0 62 movec %d0, %ACR0
63 movel #0xff00c000, %d0 /* Cache Flash also */ 63 movel #0x00000000, %d0 /* No other regions cached */
64 movec %d0, %ACR1 64 movec %d0, %ACR1
65 movel #0x80000200, %d0 /* Setup cache mask */ 65 movel #0x80000200, %d0 /* Setup cache mask */
66 movec %d0, %CACR /* Enable cache */ 66 movec %d0, %CACR /* Enable cache */
diff --git a/include/asm-m68knommu/mcfuart.h b/include/asm-m68knommu/mcfuart.h
index 873d0805219c..1319a81814b1 100644
--- a/include/asm-m68knommu/mcfuart.h
+++ b/include/asm-m68knommu/mcfuart.h
@@ -12,7 +12,6 @@
12#define mcfuart_h 12#define mcfuart_h
13/****************************************************************************/ 13/****************************************************************************/
14 14
15
16/* 15/*
17 * Define the base address of the UARTS within the MBAR address 16 * Define the base address of the UARTS within the MBAR address
18 * space. 17 * space.
@@ -33,7 +32,7 @@
33#define MCFUART_BASE2 0x240 /* Base address of UART2 */ 32#define MCFUART_BASE2 0x240 /* Base address of UART2 */
34#define MCFUART_BASE3 0x280 /* Base address of UART3 */ 33#define MCFUART_BASE3 0x280 /* Base address of UART3 */
35#elif defined(CONFIG_M5249) || defined(CONFIG_M5307) || defined(CONFIG_M5407) 34#elif defined(CONFIG_M5249) || defined(CONFIG_M5307) || defined(CONFIG_M5407)
36#if defined(CONFIG_NETtel) || defined(CONFIG_DISKtel) || defined(CONFIG_SECUREEDGEMP3) 35#if defined(CONFIG_NETtel) || defined(CONFIG_SECUREEDGEMP3)
37#define MCFUART_BASE1 0x200 /* Base address of UART1 */ 36#define MCFUART_BASE1 0x200 /* Base address of UART1 */
38#define MCFUART_BASE2 0x1c0 /* Base address of UART2 */ 37#define MCFUART_BASE2 0x1c0 /* Base address of UART2 */
39#else 38#else