diff options
| author | Christophe Leroy | 2018-03-16 17:20:35 +0100 |
|---|---|---|
| committer | Tom Rini | 2018-04-06 16:30:37 -0400 |
| commit | fdef3895a03eb45245215eb319fbbbf519d3759c (patch) | |
| tree | 9298244da98793f09390dd5a21e80021ec5e9947 | |
| parent | 374a0e306e05985a2b949713b2e80d60a6268395 (diff) | |
powerpc: mpc8xx: get rid of the multiple PVR_ values
Avoid hardcoding the PVR values in C since they are defined
in processor.h
At the same time, remove those multiple PVR values for 8xx and
keep only one that we call PVR_8xx
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
| -rw-r--r-- | arch/powerpc/cpu/mpc8xx/cpu.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/include/asm/processor.h | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/arch/powerpc/cpu/mpc8xx/cpu.c b/arch/powerpc/cpu/mpc8xx/cpu.c index 9da73ac22e2..5a81bed5a10 100644 --- a/arch/powerpc/cpu/mpc8xx/cpu.c +++ b/arch/powerpc/cpu/mpc8xx/cpu.c @@ -42,7 +42,7 @@ static int check_CPU(long clock, uint pvr, uint immr) /* the highest 16 bits should be 0x0050 for a 860 */ - if ((pvr >> 16) != 0x0050) + if (PVR_VER(pvr) != PVR_VER(PVR_8xx)) return -1; k = (immr << 16) | diff --git a/arch/powerpc/include/asm/processor.h b/arch/powerpc/include/asm/processor.h index 57b11b83657..6fbe8c46b31 100644 --- a/arch/powerpc/include/asm/processor.h +++ b/arch/powerpc/include/asm/processor.h @@ -973,10 +973,8 @@ * differentiated by the version number in the Communication Processor * Module (CPM). */ -#define PVR_821 0x00500000 -#define PVR_823 PVR_821 -#define PVR_850 PVR_821 -#define PVR_860 PVR_821 +#define PVR_8xx 0x00500000 + #define PVR_7400 0x000C0000 /* |