git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'perf-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
loongson
/
common
/
init.c
diff --git
a/arch/mips/loongson/common/init.c
b/arch/mips/loongson/common/init.c
index 3abe927422a3acfe3fea5c07030b5ed1e0c86cf8..a2abd9355737140d91c98e2c092a7d51543eee32 100644
(file)
--- a/
arch/mips/loongson/common/init.c
+++ b/
arch/mips/loongson/common/init.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2009 Lemote Inc.
& Insititute of Computing Technology
+ * Copyright (C) 2009 Lemote Inc.
* Author: Wu Zhangjin, wuzj@lemote.com
*
* This program is free software; you can redistribute it and/or modify it
* Author: Wu Zhangjin, wuzj@lemote.com
*
* This program is free software; you can redistribute it and/or modify it
@@
-10,19
+10,28
@@
#include <linux/bootmem.h>
#include <linux/bootmem.h>
-#include <asm/bootinfo.h>
-
#include <loongson.h>
#include <loongson.h>
+/* Loongson CPU address windows config space base address */
+unsigned long __maybe_unused _loongson_addrwincfg_base;
+
void __init prom_init(void)
{
void __init prom_init(void)
{
- /* init base address of io space */
+
/* init base address of io space */
set_io_port_base((unsigned long)
set_io_port_base((unsigned long)
- ioremap(BONITO_PCIIO_BASE, BONITO_PCIIO_SIZE));
+ ioremap(LOONGSON_PCIIO_BASE, LOONGSON_PCIIO_SIZE));
+
+#ifdef CONFIG_CPU_SUPPORTS_ADDRWINCFG
+ _loongson_addrwincfg_base = (unsigned long)
+ ioremap(LOONGSON_ADDRWINCFG_BASE, LOONGSON_ADDRWINCFG_SIZE);
+#endif
prom_init_cmdline();
prom_init_env();
prom_init_memory();
prom_init_cmdline();
prom_init_env();
prom_init_memory();
+
+ /*init the uart base address */
+ prom_init_uart_base();
}
void __init prom_free_prom_memory(void)
}
void __init prom_free_prom_memory(void)