diff options
Diffstat (limited to 'arch/mips/netlogic/xlp/setup.c')
-rw-r--r-- | arch/mips/netlogic/xlp/setup.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/mips/netlogic/xlp/setup.c b/arch/mips/netlogic/xlp/setup.c index 4fdd9fd29d1d..f743fd9da323 100644 --- a/arch/mips/netlogic/xlp/setup.c +++ b/arch/mips/netlogic/xlp/setup.c | |||
@@ -51,7 +51,6 @@ uint64_t nlm_io_base; | |||
51 | struct nlm_soc_info nlm_nodes[NLM_NR_NODES]; | 51 | struct nlm_soc_info nlm_nodes[NLM_NR_NODES]; |
52 | cpumask_t nlm_cpumask = CPU_MASK_CPU0; | 52 | cpumask_t nlm_cpumask = CPU_MASK_CPU0; |
53 | unsigned int nlm_threads_per_core; | 53 | unsigned int nlm_threads_per_core; |
54 | unsigned int xlp_cores_per_node; | ||
55 | 54 | ||
56 | static void nlm_linux_exit(void) | 55 | static void nlm_linux_exit(void) |
57 | { | 56 | { |
@@ -82,7 +81,7 @@ static void __init xlp_init_mem_from_bars(void) | |||
82 | uint64_t map[16]; | 81 | uint64_t map[16]; |
83 | int i, n; | 82 | int i, n; |
84 | 83 | ||
85 | n = xlp_get_dram_map(-1, map); /* -1: info for all nodes */ | 84 | n = nlm_get_dram_map(-1, map, ARRAY_SIZE(map)); /* -1 : all nodes */ |
86 | for (i = 0; i < n; i += 2) { | 85 | for (i = 0; i < n; i += 2) { |
87 | /* exclude 0x1000_0000-0x2000_0000, u-boot device */ | 86 | /* exclude 0x1000_0000-0x2000_0000, u-boot device */ |
88 | if (map[i] <= 0x10000000 && map[i+1] > 0x10000000) | 87 | if (map[i] <= 0x10000000 && map[i+1] > 0x10000000) |
@@ -163,10 +162,6 @@ void __init prom_init(void) | |||
163 | void *reset_vec; | 162 | void *reset_vec; |
164 | 163 | ||
165 | nlm_io_base = CKSEG1ADDR(XLP_DEFAULT_IO_BASE); | 164 | nlm_io_base = CKSEG1ADDR(XLP_DEFAULT_IO_BASE); |
166 | if (cpu_is_xlp9xx()) | ||
167 | xlp_cores_per_node = 32; | ||
168 | else | ||
169 | xlp_cores_per_node = 8; | ||
170 | nlm_init_boot_cpu(); | 165 | nlm_init_boot_cpu(); |
171 | xlp_mmu_init(); | 166 | xlp_mmu_init(); |
172 | nlm_node_init(0); | 167 | nlm_node_init(0); |