85xx: Added various P1012/P1013/P1021/P1022 defines
PATCH 1/1 85xx: Added various P1012/P1013/P1021/P1022 defines
There are various locations that we have chip specific info:
* Makefile for which ddr code to build
* Added P1012/P1013/P1021/P1022 to cpu_type_list and SVR list
* Added number of LAWs for P1012/P1013/P1021/P1022
* Set CONFIG_MAX_CPUS to 2 for P1021/P1022
* PCI port config
Signed-off-by Haiying Wang <[email protected]>
Signed-off-by Srikanth Srinivasan <[email protected]>
Signed-off-by Kumar Gala <[email protected]>
--- cpu/mpc85xx/Makefile | 4 ++++ cpu/mpc8xxx/cpu.c | 8 ++++++++ cpu/mpc8xxx/pci_cfg.c | 28 ++++++++++++++++++++++++++-- drivers/misc/fsl_law.c | 2 ++ include/asm-ppc/config.h | 1 + include/asm-ppc/processor.h | 8 ++++++++ 6 files changed, 49 insertions(+), 2 deletions(-)
cpu/mpc85xx/Makefile +4 -0
@@ -50,7 +50,11 @@ COBJS-$(CONFIG_MPC8572) += ddr-gen3.o COBJS-$(CONFIG_MPC8536) += ddr-gen3.o COBJS-$(CONFIG_MPC8569) += ddr-gen3.o COBJS-$(CONFIG_P1011) += ddr-gen3.o +COBJS-$(CONFIG_P1012) += ddr-gen3.o +COBJS-$(CONFIG_P1013) += ddr-gen3.o COBJS-$(CONFIG_P1020) += ddr-gen3.o +COBJS-$(CONFIG_P1021) += ddr-gen3.o +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
cpu/mpc8xxx/cpu.c +8 -0
@@ -66,8 +66,16 @@ struct cpu_type cpu_type_list [] = { CPU_TYPE_ENTRY(8572, 8572_E, 2),CPU_TYPE_ENTRY (P1011 ,P1011 ,1 ),CPU_TYPE_ENTRY (P1011 ,P1011_E ,1 ), +CPU_TYPE_ENTRY (P1012 ,P1012 ,1 ), +CPU_TYPE_ENTRY (P1012 ,P1012_E ,1 ), +CPU_TYPE_ENTRY (P1013 ,P1013 ,1 ), +CPU_TYPE_ENTRY (P1013 ,P1013_E ,1 ),CPU_TYPE_ENTRY (P1020 ,P1020 ,2 ),CPU_TYPE_ENTRY (P1020 ,P1020_E ,2 ), +CPU_TYPE_ENTRY (P1021 ,P1021 ,2 ), +CPU_TYPE_ENTRY (P1021 ,P1021_E ,2 ), +CPU_TYPE_ENTRY (P1022 ,P1022 ,2 ), +CPU_TYPE_ENTRY (P1022 ,P1022_E ,2 ),CPU_TYPE_ENTRY (P2010 ,P2010 ,1 ),CPU_TYPE_ENTRY (P2010 ,P2010_E ,1 ), CPU_TYPE_ENTRY(P2020, P2020, 2),
cpu/mpc8xxx/pci_cfg.c +26 -2
@@ -25,7 +25,7 @@#include <pci.h> struct pci_info { -u16 cfg; +u32 cfg; };/* The cfg field is a bit mask in which each bit represents the value of
@@ -153,7 +153,8 @@ static struct pci_info pci_config_info[] = (1 << 7) | (1 << 0xe) | (1 << 0xf), }, }; -#elif defined(CONFIG_P1011) || defined(CONFIG_P1020) +#elif defined(CONFIG_P1011) || defined(CONFIG_P1020) \ + defined(CONFIG_P1012) || defined(CONFIG_P1021) static struct pci_info pci_config_info[] = { [LAW_TRGT_IF_PCIE_1] = {
@@ -163,6 +164,29 @@ static struct pci_info pci_config_info[] = .cfg = (1 << 0xe), }, }; +#elif defined(CONFIG_P1013 ) || defined(CONFIG_P1022 ) +static struct pci_info pci_config_info[] = +{ + [LAW_TRGT_IF_PCIE_1 ] = { + .cfg = (1 <<6 ) | (1 <<7 ) | (1 <<9 ) | (1 <<0xa ) | + (1 <<0xb ) | (1 <<0xd ) | (1 <<0xe ) | + (1 <<0xf ) | (1 <<0x15 ) | (1 <<0x16 ) | + (1 <<0x17 ) | (1 <<0x18 ) | (1 <<0x19 ) | + (1 <<0x1a ) | (1 <<0x1b ) | (1 <<0x1c ) | + (1 <<0x1d ) | (1 <<0x1e ) | (1 <<0x1f ), + }, + [LAW_TRGT_IF_PCIE_2 ] = { + .cfg = (1 <<0 ) | (1 <<1 ) | (1 <<6 ) | (1 <<7 ) | + (1 <<9 ) | (1 <<0xa ) | (1 <<0xb ) | (1 <<0xd ) | + (1 <<0x15 ) | (1 <<0x16 ) | (1 <<0x17 ) | + (1 <<0x18 ) | (1 <<0x1c ), + }, + [LAW_TRGT_IF_PCIE_3 ] = { + .cfg = (1 <<6 ) | (1 <<7 ) | (1 <<9 ) | (1 <<0xd ) | + (1 <<0x15 ) | (1 <<0x16 ) | (1 <<0x17 ) | (1 <<0x18 ) | + (1 <<0x19 ) | (1 <<0x1a ) | (1 <<0x1b ), + }, +};#elif defined(CONFIG_P2010 ) || defined(CONFIG_P2020 )static struct pci_info pci_config_info[] = {
drivers/misc/fsl_law.c +2 -0
@@ -39,6 +39,8 @@ DECLARE_GLOBAL_DATA_PTR;#define FSL_HW_NUM_LAWS 10#elif defined(CONFIG_MPC8536 ) || defined(CONFIG_MPC8572 ) || \ defined(CONFIG_P1011 ) || defined(CONFIG_P1020 ) || \ + defined(CONFIG_P1012 ) || defined(CONFIG_P1021 ) || \ + defined(CONFIG_P1013 ) || defined(CONFIG_P1022 ) || \ defined(CONFIG_P2010 ) || defined(CONFIG_P2020 )#define FSL_HW_NUM_LAWS 12#elif defined(CONFIG_PPC_P4080 )
include/asm-ppc/config.h +1 -0
@@ -41,6 +41,7 @@#endif #if defined(CONFIG_MPC8572 ) || defined(CONFIG_P1020 ) || \ + defined(CONFIG_P1021 ) || defined(CONFIG_P1022 ) || \ defined(CONFIG_P2020 ) || defined(CONFIG_MPC8641 )#define CONFIG_MAX_CPUS 2#elif defined(CONFIG_PPC_P4080 )
include/asm-ppc/processor.h +8 -0
@@ -1033,8 +1033,16 @@#define SVR_8572_E 0x80E800#define SVR_P1011 0x80E500#define SVR_P1011_E 0x80ED00 +#define SVR_P1012 0x80E501 +#define SVR_P1012_E 0x80ED01 +#define SVR_P1013 0x80E700 +#define SVR_P1013_E 0x80EF00#define SVR_P1020 0x80E400#define SVR_P1020_E 0x80EC00 +#define SVR_P1021 0x80E401 +#define SVR_P1021_E 0x80EC01 +#define SVR_P1022 0x80E600 +#define SVR_P1022_E 0x80EE00#define SVR_P2010 0x80E300#define SVR_P2010_E 0x80EB00#define SVR_P2020 0x80E200
Signature · 1 line
1.6.0.6