powerpc/p5020: Add various p5020 related defines (and p5010)

There are various locations that we have chip specific info:

* Makefile for which ddr code to build
* Added p5020 & p5010 to cpu_type_list and SVR list
* Added number of LAWs for p5020
* Set CONFIG_MAX_CPUS to 2 for p5020

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

diff --git a/arch/powerpc/cpu/mpc85xx/Makefile b/arch/powerpc/cpu/mpc85xx/Makefile
index 4ee0e9af8cafba2a8429ed3c63443d71867e0d84..2656dde83cf9a69a60fe19a9b8ee22f4259bd1ef 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/Makefile
+++ b/arch/powerpc/cpu/mpc85xx/Makefile
@@ -59,6 +59,7 @@ COBJS-$(CONFIG_P1022) += ddr-gen3.o
 COBJS-$(CONFIG_P2010)  += ddr-gen3.o
 COBJS-$(CONFIG_P2020)  += ddr-gen3.o
 COBJS-$(CONFIG_PPC_P4080)      += ddr-gen3.o
+COBJS-$(CONFIG_PPC_P5020)      += ddr-gen3.o
 
 COBJS-$(CONFIG_CPM2)   += ether_fcc.o
 COBJS-$(CONFIG_OF_LIBFDT) += fdt.o

diff --git a/arch/powerpc/cpu/mpc8xxx/cpu.c b/arch/powerpc/cpu/mpc8xxx/cpu.c
index 22f342372315c1173ca635c580e3a68a99f6ee8f..570ddb6de8651b8d40626594366a7a1f8990d403 100644 (file)
--- a/arch/powerpc/cpu/mpc8xxx/cpu.c
+++ b/arch/powerpc/cpu/mpc8xxx/cpu.c
@@ -84,6 +84,10 @@ struct cpu_type cpu_type_list [] = {
        CPU_TYPE_ENTRY(P4040, P4040_E, 4),
        CPU_TYPE_ENTRY(P4080, P4080, 8),
        CPU_TYPE_ENTRY(P4080, P4080_E, 8),
+       CPU_TYPE_ENTRY(P5010, P5010, 1),
+       CPU_TYPE_ENTRY(P5010, P5010_E, 1),
+       CPU_TYPE_ENTRY(P5020, P5020, 2),
+       CPU_TYPE_ENTRY(P5020, P5020_E, 2),
 #elif defined(CONFIG_MPC86xx)
        CPU_TYPE_ENTRY(8610, 8610, 1),
        CPU_TYPE_ENTRY(8641, 8641, 2),

diff --git a/arch/powerpc/include/asm/config.h b/arch/powerpc/include/asm/config.h
index d88c282f75a2e64c81bcc89590d8c773c726129b..f2f4188ba3da3b7bb9acb1d0932c08e86121e4ad 100644 (file)
--- a/arch/powerpc/include/asm/config.h
+++ b/arch/powerpc/include/asm/config.h
@@ -46,6 +46,8 @@
 #define CONFIG_MAX_CPUS                2
 #elif defined(CONFIG_PPC_P4080)
 #define CONFIG_MAX_CPUS                8
+#elif defined(CONFIG_PPC_P5020)
+#define CONFIG_MAX_CPUS                2
 #else
 #define CONFIG_MAX_CPUS                1
 #endif

diff --git a/arch/powerpc/include/asm/processor.h b/arch/powerpc/include/asm/processor.h
index 844552c2d249d29e3e0067f50ae6767585aa5b5b..5e6364a3baf0574e0ad915851b9a4fe48c314986 100644 (file)
--- a/arch/powerpc/include/asm/processor.h
+++ b/arch/powerpc/include/asm/processor.h
@@ -1056,6 +1056,10 @@
 #define SVR_P4040_E    0x820900
 #define SVR_P4080      0x820000
 #define SVR_P4080_E    0x820800
+#define SVR_P5010      0x822100
+#define SVR_P5010_E    0x822900
+#define SVR_P5020      0x822000
+#define SVR_P5020_E    0x822800
 
 #define SVR_8610       0x80A000
 #define SVR_8641       0x809000

diff --git a/drivers/misc/fsl_law.c b/drivers/misc/fsl_law.c
index 628bd5964ccd58ede2b24c8c7b8a89ac97f9b82a..22270f1d0258462c07658f0d284cdee0375e19c0 100644 (file)
--- a/drivers/misc/fsl_law.c
+++ b/drivers/misc/fsl_law.c
@@ -43,7 +43,7 @@ DECLARE_GLOBAL_DATA_PTR;
       defined(CONFIG_P1013) || defined(CONFIG_P1022) || \
       defined(CONFIG_P2010) || defined(CONFIG_P2020)
 #define FSL_HW_NUM_LAWS 12
-#elif defined(CONFIG_PPC_P4080)
+#elif defined(CONFIG_PPC_P4080) || defined(CONFIG_PPC_P5020)
 #define FSL_HW_NUM_LAWS 32
 #else
 #error FSL_HW_NUM_LAWS not defined for this platform