diff options
Diffstat (limited to 'arch/sh/kernel')
-rw-r--r-- | arch/sh/kernel/cpu/sh4/setup-sh7750.c | 2 | ||||
-rw-r--r-- | arch/sh/kernel/io_generic.c | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh7750.c b/arch/sh/kernel/cpu/sh4/setup-sh7750.c index aa26245f0344..6f8f458912c7 100644 --- a/arch/sh/kernel/cpu/sh4/setup-sh7750.c +++ b/arch/sh/kernel/cpu/sh4/setup-sh7750.c | |||
@@ -46,11 +46,13 @@ static struct platform_device rtc_device = { | |||
46 | 46 | ||
47 | static struct plat_sci_port sci_platform_data[] = { | 47 | static struct plat_sci_port sci_platform_data[] = { |
48 | { | 48 | { |
49 | #ifndef CONFIG_SH_RTS7751R2D | ||
49 | .mapbase = 0xffe00000, | 50 | .mapbase = 0xffe00000, |
50 | .flags = UPF_BOOT_AUTOCONF, | 51 | .flags = UPF_BOOT_AUTOCONF, |
51 | .type = PORT_SCI, | 52 | .type = PORT_SCI, |
52 | .irqs = { 23, 24, 25, 0 }, | 53 | .irqs = { 23, 24, 25, 0 }, |
53 | }, { | 54 | }, { |
55 | #endif | ||
54 | .mapbase = 0xffe80000, | 56 | .mapbase = 0xffe80000, |
55 | .flags = UPF_BOOT_AUTOCONF, | 57 | .flags = UPF_BOOT_AUTOCONF, |
56 | .type = PORT_SCIF, | 58 | .type = PORT_SCIF, |
diff --git a/arch/sh/kernel/io_generic.c b/arch/sh/kernel/io_generic.c index 28ec7487de8c..66626c03e1ee 100644 --- a/arch/sh/kernel/io_generic.c +++ b/arch/sh/kernel/io_generic.c | |||
@@ -1,9 +1,8 @@ | |||
1 | /* $Id: io_generic.c,v 1.2 2003/05/04 19:29:53 lethal Exp $ | 1 | /* |
2 | * | 2 | * arch/sh/kernel/io_generic.c |
3 | * linux/arch/sh/kernel/io_generic.c | ||
4 | * | 3 | * |
5 | * Copyright (C) 2000 Niibe Yutaka | 4 | * Copyright (C) 2000 Niibe Yutaka |
6 | * Copyright (C) 2005 Paul Mundt | 5 | * Copyright (C) 2005 - 2007 Paul Mundt |
7 | * | 6 | * |
8 | * Generic I/O routine. These can be used where a machine specific version | 7 | * Generic I/O routine. These can be used where a machine specific version |
9 | * is not required. | 8 | * is not required. |
@@ -13,8 +12,9 @@ | |||
13 | * for more details. | 12 | * for more details. |
14 | */ | 13 | */ |
15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
16 | #include <asm/io.h> | 15 | #include <linux/io.h> |
17 | #include <asm/machvec.h> | 16 | #include <asm/machvec.h> |
17 | #include <asm/cacheflush.h> | ||
18 | 18 | ||
19 | #ifdef CONFIG_CPU_SH3 | 19 | #ifdef CONFIG_CPU_SH3 |
20 | /* SH3 has a PCMCIA bug that needs a dummy read from area 6 for a | 20 | /* SH3 has a PCMCIA bug that needs a dummy read from area 6 for a |
@@ -96,6 +96,7 @@ void generic_insw(unsigned long port, void *dst, unsigned long count) | |||
96 | while (count--) | 96 | while (count--) |
97 | *buf++ = *port_addr; | 97 | *buf++ = *port_addr; |
98 | 98 | ||
99 | flush_dcache_all(); | ||
99 | dummy_read(); | 100 | dummy_read(); |
100 | } | 101 | } |
101 | 102 | ||
@@ -170,6 +171,7 @@ void generic_outsw(unsigned long port, const void *src, unsigned long count) | |||
170 | while (count--) | 171 | while (count--) |
171 | *port_addr = *buf++; | 172 | *port_addr = *buf++; |
172 | 173 | ||
174 | flush_dcache_all(); | ||
173 | dummy_read(); | 175 | dummy_read(); |
174 | } | 176 | } |
175 | 177 | ||