1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-28 15:05:20 +02:00

uplevel arch-patches to .28

This commit is contained in:
Marek Lindner 2009-07-01 13:49:44 +08:00 committed by Xiangfu Liu
parent 91cc144708
commit 5b2fbd7f57

View File

@ -29454,8 +29454,8 @@
cpu_wait = r4k_wait;
break;
@@ -802,6 +803,22 @@
}
@@ -860,6 +860,23 @@
}
}
+static inline void cpu_probe_ingenic(struct cpuinfo_mips *c)
@ -29467,6 +29467,7 @@
+ c->cputype = CPU_JZRISC;
+ c->isa_level = MIPS_CPU_ISA_M32R1;
+ c->tlbsize = 32;
+ __cpu_name[cpu] = "Ingenic JZRISC";
+ break;
+ default:
+ panic("Unknown Ingenic Processor ID!");
@ -29474,27 +29475,19 @@
+ }
+}
+
const char *__cpu_name[NR_CPUS];
/*
@@ -880,6 +897,7 @@
case CPU_BCM4710: name = "Broadcom BCM4710"; break;
case CPU_PR4450: name = "Philips PR4450"; break;
case CPU_LOONGSON2: name = "ICT Loongson-2"; break;
+ case CPU_JZRISC: name = "Ingenic JZRISC"; break;
default:
BUG();
}
@@ -919,6 +937,9 @@
case PRID_COMP_PHILIPS:
cpu_probe_philips(c);
break;
+ case PRID_COMP_INGENIC:
static inline void cpu_probe_broadcom(struct cpuinfo_mips *c, unsigned int cpu)
{
decode_configs(c);
@@ -909,6 +926,9 @@
case PRID_COMP_NXP:
cpu_probe_nxp(c, cpu);
break;
+ case PRID_COMP_INGENIC:
+ cpu_probe_ingenic(c);
+ break;
default:
c->cputype = CPU_UNKNOWN;
}
}
BUG_ON(!__cpu_name[cpu]);
--- linux-2.6.24.7.old/arch/mips/mm/c-r4k.c 2008-05-07 01:22:34.000000000 +0200
+++ linux-2.6.24.7/arch/mips/mm/c-r4k.c 2009-04-12 18:13:57.000000000 +0200
@@ -874,6 +874,36 @@