[PATCH] ppc32: Kill PVR_440* defines
The following patch changes the usages of PVR_440* into strcmp's with the cpu_name field, and removes the defines altogether. The Ebony portion was briefly tested long ago. One benefit of moving from PVR-tests to string tests in general is that not all CPUs can be on and be able to do this type of comparison. See http://patchwork.ozlabs.org/linuxppc/patch?id=1250 for the original thread. Signed-off-by: Tom Rini <trini@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
66b375bf7d
commit
95409aaca7
|
@ -91,15 +91,10 @@ ebony_calibrate_decr(void)
|
||||||
* on Rev. C silicon then errata forces us to
|
* on Rev. C silicon then errata forces us to
|
||||||
* use the internal clock.
|
* use the internal clock.
|
||||||
*/
|
*/
|
||||||
switch (PVR_REV(mfspr(SPRN_PVR))) {
|
if (strcmp(cur_cpu_spec[0]->cpu_name, "440GP Rev. B") == 0)
|
||||||
case PVR_REV(PVR_440GP_RB):
|
freq = EBONY_440GP_RB_SYSCLK;
|
||||||
freq = EBONY_440GP_RB_SYSCLK;
|
else
|
||||||
break;
|
freq = EBONY_440GP_RC_SYSCLK;
|
||||||
case PVR_REV(PVR_440GP_RC1):
|
|
||||||
default:
|
|
||||||
freq = EBONY_440GP_RC_SYSCLK;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
ibm44x_calibrate_decr(freq);
|
ibm44x_calibrate_decr(freq);
|
||||||
}
|
}
|
||||||
|
|
|
@ -236,9 +236,10 @@ void __init ibm440gx_l2c_setup(struct ibm44x_clocks* p)
|
||||||
/* Disable L2C on rev.A, rev.B and 800MHz version of rev.C,
|
/* Disable L2C on rev.A, rev.B and 800MHz version of rev.C,
|
||||||
enable it on all other revisions
|
enable it on all other revisions
|
||||||
*/
|
*/
|
||||||
u32 pvr = mfspr(SPRN_PVR);
|
if (strcmp(cur_cpu_spec[0]->cpu_name, "440GX Rev. A") == 0 ||
|
||||||
if (pvr == PVR_440GX_RA || pvr == PVR_440GX_RB ||
|
strcmp(cur_cpu_spec[0]->cpu_name, "440GX Rev. B") == 0
|
||||||
(pvr == PVR_440GX_RC && p->cpu > 667000000))
|
|| (strcmp(cur_cpu_spec[0]->cpu_name, "440GX Rev. C")
|
||||||
|
== 0 && p->cpu > 667000000))
|
||||||
ibm440gx_l2c_disable();
|
ibm440gx_l2c_disable();
|
||||||
else
|
else
|
||||||
ibm440gx_l2c_enable();
|
ibm440gx_l2c_enable();
|
||||||
|
|
|
@ -366,12 +366,6 @@
|
||||||
#define PVR_STB03XXX 0x40310000
|
#define PVR_STB03XXX 0x40310000
|
||||||
#define PVR_NP405H 0x41410000
|
#define PVR_NP405H 0x41410000
|
||||||
#define PVR_NP405L 0x41610000
|
#define PVR_NP405L 0x41610000
|
||||||
#define PVR_440GP_RB 0x40120440
|
|
||||||
#define PVR_440GP_RC1 0x40120481
|
|
||||||
#define PVR_440GP_RC2 0x40200481
|
|
||||||
#define PVR_440GX_RA 0x51b21850
|
|
||||||
#define PVR_440GX_RB 0x51b21851
|
|
||||||
#define PVR_440GX_RC 0x51b21892
|
|
||||||
#define PVR_601 0x00010000
|
#define PVR_601 0x00010000
|
||||||
#define PVR_602 0x00050000
|
#define PVR_602 0x00050000
|
||||||
#define PVR_603 0x00030000
|
#define PVR_603 0x00030000
|
||||||
|
|
Loading…
Reference in a new issue