patch-2.4.25 linux-2.4.25/arch/mips/vr41xx/common/bcu.c
Next file: linux-2.4.25/arch/mips/vr41xx/common/cmu.c
Previous file: linux-2.4.25/arch/mips/vr41xx/common/Makefile
Back to the patch index
Back to the overall index
- Lines: 225
- Date:
2004-02-18 05:36:30.000000000 -0800
- Orig file:
linux-2.4.24/arch/mips/vr41xx/common/bcu.c
- Orig date:
2003-08-25 04:44:40.000000000 -0700
diff -urN linux-2.4.24/arch/mips/vr41xx/common/bcu.c linux-2.4.25/arch/mips/vr41xx/common/bcu.c
@@ -33,27 +33,22 @@
/*
* Changes:
* MontaVista Software Inc. <yyuasa@mvista.com> or <source@mvista.com>
+ * - New creation, NEC VR4122 and VR4131 are supported.
* - Added support for NEC VR4111 and VR4121.
*
- * Paul Mundt <lethal@chaoticdreams.org>
- * - Calculate mips_counter_frequency properly on VR4131.
- *
- * MontaVista Software Inc. <yyuasa@mvista.com> or <source@mvista.com>
- * - New creation, NEC VR4122 and VR4131 are supported.
+ * Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
+ * - Added support for NEC VR4133.
*/
#include <linux/init.h>
#include <linux/types.h>
-#include <asm/addrspace.h>
#include <asm/cpu.h>
#include <asm/io.h>
-#include <asm/time.h>
-#include <asm/vr41xx/vr41xx.h>
-#define VR4111_CLKSPEEDREG KSEG1ADDR(0x0b000014)
-#define VR4122_CLKSPEEDREG KSEG1ADDR(0x0f000014)
-#define VR4131_CLKSPEEDREG VR4122_CLKSPEEDREG
+#define CLKSPEEDREG_TYPE1 KSEG1ADDR(0x0b000014)
+#define CLKSPEEDREG_TYPE2 KSEG1ADDR(0x0f000014)
#define CLKSP(x) ((x) & 0x001f)
+ #define CLKSP_VR4133(x) ((x) & 0x0007)
#define DIV2B 0x8000
#define DIV3B 0x4000
@@ -65,15 +60,27 @@
#define TDIVMODE(x) (2 << (((x) & 0x1000) >> 12))
#define VTDIVMODE(x) (((x) & 0x0700) >> 8)
-unsigned long vr41xx_vtclock = 0;
+static unsigned long vr41xx_vtclock;
+static unsigned long vr41xx_tclock;
+
+unsigned long vr41xx_get_vtclock_frequency(void)
+{
+ return vr41xx_vtclock;
+}
+
+unsigned long vr41xx_get_tclock_frequency(void)
+{
+ return vr41xx_tclock;
+}
-static inline u16 read_clkspeed(void)
+static inline uint16_t read_clkspeed(void)
{
switch (current_cpu_data.cputype) {
case CPU_VR4111:
- case CPU_VR4121: return readw(VR4111_CLKSPEEDREG);
- case CPU_VR4122: return readw(VR4122_CLKSPEEDREG);
- case CPU_VR4131: return readw(VR4131_CLKSPEEDREG);
+ case CPU_VR4121: return readw(CLKSPEEDREG_TYPE1);
+ case CPU_VR4122:
+ case CPU_VR4131:
+ case CPU_VR4133: return readw(CLKSPEEDREG_TYPE2);
default:
printk(KERN_INFO "Unexpected CPU of NEC VR4100 series\n");
break;
@@ -82,7 +89,7 @@
return 0;
}
-static inline unsigned long calculate_pclock(u16 clkspeed)
+static inline unsigned long calculate_pclock(uint16_t clkspeed)
{
unsigned long pclock = 0;
@@ -90,63 +97,90 @@
case CPU_VR4111:
case CPU_VR4121:
pclock = 18432000 * 64;
+ pclock /= CLKSP(clkspeed);
break;
case CPU_VR4122:
pclock = 18432000 * 98;
+ pclock /= CLKSP(clkspeed);
break;
case CPU_VR4131:
pclock = 18432000 * 108;
+ pclock /= CLKSP(clkspeed);
+ break;
+ case CPU_VR4133:
+ switch (CLKSP_VR4133(clkspeed)) {
+ case 0:
+ pclock = 133000000;
+ break;
+ case 1:
+ pclock = 149000000;
+ break;
+ case 2:
+ pclock = 165900000;
+ break;
+ case 3:
+ pclock = 199100000;
+ break;
+ case 4:
+ pclock = 265900000;
+ break;
+ default:
+ printk(KERN_INFO "Unknown PClock speed for NEC VR4133\n");
+ break;
+ }
break;
default:
printk(KERN_INFO "Unexpected CPU of NEC VR4100 series\n");
break;
}
- pclock /= CLKSP(clkspeed);
printk(KERN_INFO "PClock: %ldHz\n", pclock);
return pclock;
}
-static inline unsigned long calculate_vtclock(u16 clkspeed, unsigned long pclock)
+static inline unsigned long calculate_vtclock(uint16_t clkspeed, unsigned long pclock)
{
+ unsigned long vtclock = 0;
+
switch (current_cpu_data.cputype) {
case CPU_VR4111:
/* The NEC VR4111 doesn't have the VTClock. */
break;
case CPU_VR4121:
- vr41xx_vtclock = pclock;
+ vtclock = pclock;
/* DIVVT == 9 Divide by 1.5 . VTClock = (PClock * 6) / 9 */
if (DIVVT(clkspeed) == 9)
- vr41xx_vtclock = pclock * 6;
+ vtclock = pclock * 6;
/* DIVVT == 10 Divide by 2.5 . VTClock = (PClock * 4) / 10 */
else if (DIVVT(clkspeed) == 10)
- vr41xx_vtclock = pclock * 4;
- vr41xx_vtclock /= DIVVT(clkspeed);
- printk(KERN_INFO "VTClock: %ldHz\n", vr41xx_vtclock);
+ vtclock = pclock * 4;
+ vtclock /= DIVVT(clkspeed);
+ printk(KERN_INFO "VTClock: %ldHz\n", vtclock);
break;
case CPU_VR4122:
if(VTDIVMODE(clkspeed) == 7)
- vr41xx_vtclock = pclock / 1;
+ vtclock = pclock / 1;
else if(VTDIVMODE(clkspeed) == 1)
- vr41xx_vtclock = pclock / 2;
+ vtclock = pclock / 2;
else
- vr41xx_vtclock = pclock / VTDIVMODE(clkspeed);
- printk(KERN_INFO "VTClock: %ldHz\n", vr41xx_vtclock);
+ vtclock = pclock / VTDIVMODE(clkspeed);
+ printk(KERN_INFO "VTClock: %ldHz\n", vtclock);
break;
case CPU_VR4131:
- vr41xx_vtclock = pclock / VTDIVMODE(clkspeed);
- printk(KERN_INFO "VTClock: %ldHz\n", vr41xx_vtclock);
+ case CPU_VR4133:
+ vtclock = pclock / VTDIVMODE(clkspeed);
+ printk(KERN_INFO "VTClock: %ldHz\n", vtclock);
break;
default:
printk(KERN_INFO "Unexpected CPU of NEC VR4100 series\n");
break;
}
- return vr41xx_vtclock;
+ return vtclock;
}
-static inline unsigned long calculate_tclock(u16 clkspeed, unsigned long pclock,
+static inline unsigned long calculate_tclock(uint16_t clkspeed, unsigned long pclock,
unsigned long vtclock)
{
unsigned long tclock = 0;
@@ -165,6 +199,7 @@
break;
case CPU_VR4122:
case CPU_VR4131:
+ case CPU_VR4133:
tclock = vtclock / TDIVMODE(clkspeed);
break;
default:
@@ -177,30 +212,14 @@
return tclock;
}
-static inline unsigned long calculate_mips_counter_frequency(unsigned long tclock)
-{
- /*
- * VR4131 Revision 2.0 and 2.1 use a value of (tclock / 2).
- */
- if ((current_cpu_data.processor_id == PRID_VR4131_REV2_0) ||
- (current_cpu_data.processor_id == PRID_VR4131_REV2_1))
- tclock /= 2;
- else
- tclock /= 4;
-
- return tclock;
-}
-
void __init vr41xx_bcu_init(void)
{
- unsigned long pclock, vtclock, tclock;
- u16 clkspeed;
+ unsigned long pclock;
+ uint16_t clkspeed;
clkspeed = read_clkspeed();
pclock = calculate_pclock(clkspeed);
- vtclock = calculate_vtclock(clkspeed, pclock);
- tclock = calculate_tclock(clkspeed, pclock, vtclock);
-
- mips_counter_frequency = calculate_mips_counter_frequency(tclock);
+ vr41xx_vtclock = calculate_vtclock(clkspeed, pclock);
+ vr41xx_tclock = calculate_tclock(clkspeed, pclock, vr41xx_vtclock);
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)