diff options
author | Paul Mundt <lethal@linux-sh.org> | 2006-09-27 03:43:28 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2006-09-27 03:43:28 -0400 |
commit | 959f85f8a3223c116bbe95dd8a9b207790b5d4d3 (patch) | |
tree | e7da9ccf292f860bfa0ff9cc8b2682cd1d6bad4d /arch/sh/boards/sh03 | |
parent | e108b2ca2349f510ce7d7f910eda89f71d710d84 (diff) |
sh: Consolidated SH7751/SH7780 PCI support.
This cleans up quite a lot of the PCI mess that we
currently have, and attempts to consolidate the
duplication in the SH7780 and SH7751 PCI controllers.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/boards/sh03')
-rw-r--r-- | arch/sh/boards/sh03/setup.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/sh/boards/sh03/setup.c b/arch/sh/boards/sh03/setup.c index dab742a00c6f..7d31d6aed8a5 100644 --- a/arch/sh/boards/sh03/setup.c +++ b/arch/sh/boards/sh03/setup.c | |||
@@ -12,11 +12,10 @@ | |||
12 | #include <asm/sh03/io.h> | 12 | #include <asm/sh03/io.h> |
13 | #include <asm/sh03/sh03.h> | 13 | #include <asm/sh03/sh03.h> |
14 | #include <asm/addrspace.h> | 14 | #include <asm/addrspace.h> |
15 | #include "../../drivers/pci/pci-sh7751.h" | ||
16 | 15 | ||
17 | const char *get_system_type(void) | 16 | const char *get_system_type(void) |
18 | { | 17 | { |
19 | return "Interface CTP/PCI-SH03)"; | 18 | return "Interface (CTP/PCI-SH03)"; |
20 | } | 19 | } |
21 | 20 | ||
22 | static void init_sh03_IRQ(void) | 21 | static void init_sh03_IRQ(void) |
@@ -39,7 +38,7 @@ static void __iomem *sh03_ioport_map(unsigned long port, unsigned int size) | |||
39 | if (((port >= 0x1f0) && (port <= 0x1f7)) || (port == 0x3f6)) | 38 | if (((port >= 0x1f0) && (port <= 0x1f7)) || (port == 0x3f6)) |
40 | return (void __iomem *)((unsigned long)cf_io_base + port); | 39 | return (void __iomem *)((unsigned long)cf_io_base + port); |
41 | 40 | ||
42 | return (void __iomem *)(port + SH7751_PCI_IO_BASE); | 41 | return (void __iomem *)(port + PCI_IO_BASE); |
43 | } | 42 | } |
44 | 43 | ||
45 | struct sh_machine_vector mv_sh03 __initmv = { | 44 | struct sh_machine_vector mv_sh03 __initmv = { |
@@ -51,7 +50,6 @@ struct sh_machine_vector mv_sh03 __initmv = { | |||
51 | .mv_heartbeat = heartbeat_sh03, | 50 | .mv_heartbeat = heartbeat_sh03, |
52 | #endif | 51 | #endif |
53 | }; | 52 | }; |
54 | |||
55 | ALIAS_MV(sh03) | 53 | ALIAS_MV(sh03) |
56 | 54 | ||
57 | /* arch/sh/boards/sh03/rtc.c */ | 55 | /* arch/sh/boards/sh03/rtc.c */ |