diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2012-01-11 09:42:10 -0500 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2012-01-11 09:42:10 -0500 |
| commit | 7a5c3b8c5c27211846efe7029a3d2ee7087425e3 (patch) | |
| tree | 92530366912b64c2826a882a79ebcfbe6ec28d59 /arch/mips/kernel | |
| parent | 39b741431af7f6f46b2e0e7f7f13ea2351fb4a5f (diff) | |
| parent | 2af99920d56debcf879ac71a1934e8fcccdc713e (diff) | |
Merge branch 'next/alchemy' into mips-for-linux-next
Diffstat (limited to 'arch/mips/kernel')
| -rw-r--r-- | arch/mips/kernel/cpu-probe.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c index c7d3cf1ce46e..98383995e6ac 100644 --- a/arch/mips/kernel/cpu-probe.c +++ b/arch/mips/kernel/cpu-probe.c | |||
| @@ -1014,6 +1014,13 @@ static inline void cpu_probe_netlogic(struct cpuinfo_mips *c, int cpu) | |||
| 1014 | { | 1014 | { |
| 1015 | decode_configs(c); | 1015 | decode_configs(c); |
| 1016 | 1016 | ||
| 1017 | if ((c->processor_id & 0xff00) == PRID_IMP_NETLOGIC_AU13XX) { | ||
| 1018 | c->cputype = CPU_ALCHEMY; | ||
| 1019 | __cpu_name[cpu] = "Au1300"; | ||
| 1020 | /* following stuff is not for Alchemy */ | ||
| 1021 | return; | ||
| 1022 | } | ||
| 1023 | |||
| 1017 | c->options = (MIPS_CPU_TLB | | 1024 | c->options = (MIPS_CPU_TLB | |
| 1018 | MIPS_CPU_4KEX | | 1025 | MIPS_CPU_4KEX | |
| 1019 | MIPS_CPU_COUNTER | | 1026 | MIPS_CPU_COUNTER | |