[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>

2 files changed, 8 insertions, 12 deletions

diff --git a/arch/ppc/platforms/4xx/ebony.c b/arch/ppc/platforms/4xx/ebony.c
index 0fd3442f5131..d6b2b1965dcb 100644
--- a/arch/ppc/platforms/4xx/ebony.c
+++ b/arch/ppc/platforms/4xx/ebony.c
@@ -91,15 +91,10 @@ ebony_calibrate_decr(void)
          * on Rev. C silicon then errata forces us to
          * use the internal clock.
          */
-        switch (PVR_REV(mfspr(SPRN_PVR))) {
-                case PVR_REV(PVR_440GP_RB):
-                        freq = EBONY_440GP_RB_SYSCLK;
-                        break;
-                case PVR_REV(PVR_440GP_RC1):
-                default:
-                        freq = EBONY_440GP_RC_SYSCLK;
-                        break;
-        }
+        if (strcmp(cur_cpu_spec[0]->cpu_name, "440GP Rev. B") == 0)
+                freq = EBONY_440GP_RB_SYSCLK;
+        else
+                freq = EBONY_440GP_RC_SYSCLK;
 
         ibm44x_calibrate_decr(freq);
 }
diff --git a/arch/ppc/syslib/ibm440gx_common.c b/arch/ppc/syslib/ibm440gx_common.c
index d4776af6a3ca..0bb919859b8b 100644
--- a/arch/ppc/syslib/ibm440gx_common.c
+++ b/arch/ppc/syslib/ibm440gx_common.c
@@ -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,
            enable it on all other revisions
          */
-        u32 pvr = mfspr(SPRN_PVR);
-        if (pvr == PVR_440GX_RA || pvr == PVR_440GX_RB ||
-            (pvr == PVR_440GX_RC && p->cpu > 667000000))
+        if (strcmp(cur_cpu_spec[0]->cpu_name, "440GX Rev. A") == 0 ||
+                        strcmp(cur_cpu_spec[0]->cpu_name, "440GX Rev. B") == 0
+                        || (strcmp(cur_cpu_spec[0]->cpu_name, "440GX Rev. C")
+                                == 0 && p->cpu > 667000000))
                 ibm440gx_l2c_disable();
         else
                 ibm440gx_l2c_enable();