diff options
author | Thomas Bogendoerfer <tsbogend@alpha.franken.de> | 2011-11-22 09:38:02 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2011-12-07 17:03:44 -0500 |
commit | e84de0c61905030a0fe66b7210b6f1bb7c3e1eab (patch) | |
tree | 005bbd00a34966e36dd99dcbfd66428bf97769fa /arch/mips/sgi-ip22/ip22-setup.c | |
parent | 5611cc4572e889b62a7b4c72a413536bf6a9c416 (diff) |
MIPS: GIO bus support for SGI IP22/28
SGI IP22/IP28 machines have GIO busses for adding graphics and other
extension cards. This patch adds support for GIO driver/device
handling and converts the newport console driver to a GIO driver.
[ralf@linux-mips.org: Fixed build error caused by the modules.h -> export.h
changes.]
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Acked-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
To: linux-fbdev@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/2886/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/sgi-ip22/ip22-setup.c')
-rw-r--r-- | arch/mips/sgi-ip22/ip22-setup.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/arch/mips/sgi-ip22/ip22-setup.c b/arch/mips/sgi-ip22/ip22-setup.c index 5e6621349471..c7bdfe43df5b 100644 --- a/arch/mips/sgi-ip22/ip22-setup.c +++ b/arch/mips/sgi-ip22/ip22-setup.c | |||
@@ -26,9 +26,6 @@ | |||
26 | #include <asm/sgi/hpc3.h> | 26 | #include <asm/sgi/hpc3.h> |
27 | #include <asm/sgi/ip22.h> | 27 | #include <asm/sgi/ip22.h> |
28 | 28 | ||
29 | unsigned long sgi_gfxaddr; | ||
30 | EXPORT_SYMBOL_GPL(sgi_gfxaddr); | ||
31 | |||
32 | extern void ip22_be_init(void) __init; | 29 | extern void ip22_be_init(void) __init; |
33 | 30 | ||
34 | void __init plat_mem_setup(void) | 31 | void __init plat_mem_setup(void) |
@@ -78,22 +75,4 @@ void __init plat_mem_setup(void) | |||
78 | prom_flags |= PROM_FLAG_USE_AS_CONSOLE; | 75 | prom_flags |= PROM_FLAG_USE_AS_CONSOLE; |
79 | add_preferred_console("arc", 0, NULL); | 76 | add_preferred_console("arc", 0, NULL); |
80 | } | 77 | } |
81 | |||
82 | #if defined(CONFIG_VT) && defined(CONFIG_SGI_NEWPORT_CONSOLE) | ||
83 | { | ||
84 | ULONG *gfxinfo; | ||
85 | ULONG * (*__vec)(void) = (void *) (long) | ||
86 | *((_PULONG *)(long)((PROMBLOCK)->pvector + 0x20)); | ||
87 | |||
88 | gfxinfo = __vec(); | ||
89 | sgi_gfxaddr = ((gfxinfo[1] >= 0xa0000000 | ||
90 | && gfxinfo[1] <= 0xc0000000) | ||
91 | ? gfxinfo[1] - 0xa0000000 : 0); | ||
92 | |||
93 | /* newport addresses? */ | ||
94 | if (sgi_gfxaddr == 0x1f0f0000 || sgi_gfxaddr == 0x1f4f0000) { | ||
95 | conswitchp = &newport_con; | ||
96 | } | ||
97 | } | ||
98 | #endif | ||
99 | } | 78 | } |