Browse Source

powerpc/8xx: Use symbolic PVR value

For the 8xx, PVR values defined in arch/powerpc/include/asm/reg.h
are nowhere used.

Remove all defines and add PVR_8xx

Use it in arch/powerpc/kernel/cputable.c

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Christophe Leroy 8 năm trước cách đây
mục cha
commit
3ee87674e0

+ 2 - 4
arch/powerpc/include/asm/reg.h

@@ -1247,10 +1247,8 @@
  * differentiated by the version number in the Communication Processor
  * differentiated by the version number in the Communication Processor
  * Module (CPM).
  * 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_8240	0x00810100
 #define PVR_8240	0x00810100
 #define PVR_8245	0x80811014
 #define PVR_8245	0x80811014
 #define PVR_8260	PVR_8240
 #define PVR_8260	PVR_8240

+ 1 - 1
arch/powerpc/kernel/cputable.c

@@ -1262,7 +1262,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
 #ifdef CONFIG_PPC_8xx
 #ifdef CONFIG_PPC_8xx
 	{	/* 8xx */
 	{	/* 8xx */
 		.pvr_mask		= 0xffff0000,
 		.pvr_mask		= 0xffff0000,
-		.pvr_value		= 0x00500000,
+		.pvr_value		= PVR_8xx,
 		.cpu_name		= "8xx",
 		.cpu_name		= "8xx",
 		/* CPU_FTR_MAYBE_CAN_DOZE is possible,
 		/* CPU_FTR_MAYBE_CAN_DOZE is possible,
 		 * if the 8xx code is there.... */
 		 * if the 8xx code is there.... */