ppc/p4080: Add various p4080 related defines (and p4040)

There are various locations that we have chip specific info:

* Makefile for which ddr code to build
* Added p4080 & p4040 to cpu_type_list and SVR list
* Added number of LAWs for p4080
* Set CONFIG_MAX_CPUS to 8 for p4080

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

diff --git a/cpu/mpc85xx/Makefile b/cpu/mpc85xx/Makefile
index 3ef00e850696fac4a3d7107daed7a6d25fb5c303..56de7eb3818f675ca46db4d09ef63ec347beda0a 100644 (file)
--- a/cpu/mpc85xx/Makefile
+++ b/cpu/mpc85xx/Makefile
@@ -53,6 +53,7 @@ COBJS-$(CONFIG_P1011) += ddr-gen3.o
 COBJS-$(CONFIG_P1020)  += ddr-gen3.o
 COBJS-$(CONFIG_P2010)  += ddr-gen3.o
 COBJS-$(CONFIG_P2020)  += ddr-gen3.o
+COBJS-$(CONFIG_PPC_P4080)      += ddr-gen3.o
 
 COBJS-$(CONFIG_CPM2)   += ether_fcc.o
 COBJS-$(CONFIG_OF_LIBFDT) += fdt.o

diff --git a/cpu/mpc8xxx/cpu.c b/cpu/mpc8xxx/cpu.c
index 00791e11bd53790edf567a358ef50b48873ede84..d191263f5087c59207d452a19fa6871228e573a5 100644 (file)
--- a/cpu/mpc8xxx/cpu.c
+++ b/cpu/mpc8xxx/cpu.c
@@ -72,6 +72,10 @@ struct cpu_type cpu_type_list [] = {
        CPU_TYPE_ENTRY(P2010, P2010_E, 1),
        CPU_TYPE_ENTRY(P2020, P2020, 2),
        CPU_TYPE_ENTRY(P2020, P2020_E, 2),
+       CPU_TYPE_ENTRY(P4040, P4040, 4),
+       CPU_TYPE_ENTRY(P4040, P4040_E, 4),
+       CPU_TYPE_ENTRY(P4080, P4080, 8),
+       CPU_TYPE_ENTRY(P4080, P4080_E, 8),
 #elif defined(CONFIG_MPC86xx)
        CPU_TYPE_ENTRY(8610, 8610, 1),
        CPU_TYPE_ENTRY(8641, 8641, 2),

diff --git a/drivers/misc/fsl_law.c b/drivers/misc/fsl_law.c
index 7c59c887f13d0d1ff1c209d151adc7f29f21c7d3..425eb181bf019ad4e506645aa9b885eabc110b4a 100644 (file)
--- a/drivers/misc/fsl_law.c
+++ b/drivers/misc/fsl_law.c
@@ -41,6 +41,8 @@ DECLARE_GLOBAL_DATA_PTR;
       defined(CONFIG_P1011) || defined(CONFIG_P1020) || \
       defined(CONFIG_P2010) || defined(CONFIG_P2020)
 #define FSL_HW_NUM_LAWS 12
+#elif defined(CONFIG_PPC_P4080)
+#define FSL_HW_NUM_LAWS 32
 #else
 #error FSL_HW_NUM_LAWS not defined for this platform
 #endif

diff --git a/include/asm-ppc/config.h b/include/asm-ppc/config.h
index 5670d06a4412342f2252625fd8dea3936b806109..e35b0b77fc8b9386697ee2b93958267f713e1bdb 100644 (file)
--- a/include/asm-ppc/config.h
+++ b/include/asm-ppc/config.h
@@ -40,9 +40,11 @@
 
 #if defined(CONFIG_MPC8572) || defined(CONFIG_P1020) || \
        defined(CONFIG_P2020) || defined(CONFIG_MPC8641)
-#define CONFIG_MAX_CPUS        2
+#define CONFIG_MAX_CPUS                2
+#elif defined(CONFIG_PPC_P4080)
+#define CONFIG_MAX_CPUS                8
 #else
-#define CONFIG_MAX_CPUS        1
+#define CONFIG_MAX_CPUS                1
 #endif
 
 #endif /* _ASM_CONFIG_H_ */

diff --git a/include/asm-ppc/processor.h b/include/asm-ppc/processor.h
index 3764a5a51d53955da0290df0dee35c12980a19bd..d009957d8b03cd11b14fd80595103f3241243fdc 100644 (file)
--- a/include/asm-ppc/processor.h
+++ b/include/asm-ppc/processor.h
@@ -1031,6 +1031,10 @@
 #define SVR_P2010_E    0x80EB00
 #define SVR_P2020      0x80E200
 #define SVR_P2020_E    0x80EA00
+#define SVR_P4040      0x820100
+#define SVR_P4040_E    0x820900
+#define SVR_P4080      0x820000
+#define SVR_P4080_E    0x820800
 
 #define SVR_8610       0x80A000
 #define SVR_8641       0x809000