Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-11 07:34:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

mpc85xx: Add support for the P2020

Browse source 
Added various p2020 processor specific details:
* SVR for p2020, p2020E
* immap updates for LAWs and DDR on p2020
* LAW defines related to p2020

Signed-off-by: Srikanth Srinivasan <srikanth.srinivasan@freescale.com>
Signed-off-by: Travis Wheatley <Travis.Wheatley@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
Srikanth Srinivasan 2009-01-21 17:17:33 -06:00 committed by Andy Fleming
parent cb69e4de87
commit 8d949aff38
6 changed files with 32 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cpu/mpc85xx/Makefile
View file

@ -48,6 +48,7 @@ COBJS-$(CONFIG_MPC8544) += ddr-gen2.o
# supports ddr1/2/3 # supports ddr1/2/3
COBJS-$(CONFIG_MPC8572) += ddr-gen3.o COBJS-$(CONFIG_MPC8572) += ddr-gen3.o
COBJS-$(CONFIG_MPC8536) += ddr-gen3.o COBJS-$(CONFIG_MPC8536) += ddr-gen3.o
COBJS-$(CONFIG_P2020) += ddr-gen3.o
COBJS-$(CONFIG_MPC8536) += mpc8536_serdes.o COBJS-$(CONFIG_MPC8536) += mpc8536_serdes.o
COBJS = traps.o cpu.o cpu_init.o speed.o interrupts.o tlb.o \ COBJS = traps.o cpu.o cpu_init.o speed.o interrupts.o tlb.o \

2
cpu/mpc85xx/cpu.c
View file

@ -62,6 +62,8 @@ struct cpu_type cpu_type_list [] = {
CPU_TYPE_ENTRY(8568, 8568_E), CPU_TYPE_ENTRY(8568, 8568_E),
CPU_TYPE_ENTRY(8572, 8572), CPU_TYPE_ENTRY(8572, 8572),
CPU_TYPE_ENTRY(8572, 8572_E), CPU_TYPE_ENTRY(8572, 8572_E),
CPU_TYPE_ENTRY(P2020, P2020),
CPU_TYPE_ENTRY(P2020, P2020_E),
}; };
struct cpu_type *identify_cpu(u32 ver) struct cpu_type *identify_cpu(u32 ver)

3
drivers/misc/fsl_law.c
View file

@ -38,7 +38,8 @@ DECLARE_GLOBAL_DATA_PTR;
defined(CONFIG_MPC8568) || \ defined(CONFIG_MPC8568) || \
defined(CONFIG_MPC8641) || defined(CONFIG_MPC8610) defined(CONFIG_MPC8641) || defined(CONFIG_MPC8610)
#define FSL_HW_NUM_LAWS 10 #define FSL_HW_NUM_LAWS 10
#elif defined(CONFIG_MPC8536) || defined(CONFIG_MPC8572) #elif defined(CONFIG_MPC8536) || defined(CONFIG_MPC8572) || \
defined(CONFIG_P2020)
#define FSL_HW_NUM_LAWS 12 #define FSL_HW_NUM_LAWS 12
#else #else
#error FSL_HW_NUM_LAWS not defined for this platform #error FSL_HW_NUM_LAWS not defined for this platform

4
include/asm-ppc/fsl_law.h
View file

@ -42,7 +42,7 @@ enum law_trgt_if {
#ifndef CONFIG_MPC8641 #ifndef CONFIG_MPC8641
LAW_TRGT_IF_PCIE_1 = 0x02, LAW_TRGT_IF_PCIE_1 = 0x02,
#endif #endif
#ifndef CONFIG_MPC8572 #if !defined(CONFIG_MPC8572) && !defined(CONFIG_P2020)
LAW_TRGT_IF_PCIE_3 = 0x03, LAW_TRGT_IF_PCIE_3 = 0x03,
#endif #endif
LAW_TRGT_IF_LBC = 0x04, LAW_TRGT_IF_LBC = 0x04,
@ -61,7 +61,7 @@ enum law_trgt_if {
#define LAW_TRGT_IF_PCIE_1 LAW_TRGT_IF_PCI #define LAW_TRGT_IF_PCIE_1 LAW_TRGT_IF_PCI
#endif #endif
#ifdef CONFIG_MPC8572 #if defined(CONFIG_MPC8572) || defined(CONFIG_P2020)
#define LAW_TRGT_IF_PCIE_3 LAW_TRGT_IF_PCI #define LAW_TRGT_IF_PCIE_3 LAW_TRGT_IF_PCI
#endif #endif

25
include/asm-ppc/immap_85xx.h
View file

@ -58,7 +58,23 @@ typedef struct ccsr_local_ecm {
uint lawbar7; /* 0xce8 - Local Access Window 7 Base Address Register */ uint lawbar7; /* 0xce8 - Local Access Window 7 Base Address Register */
char res19[4]; char res19[4];
uint lawar7; /* 0xcf0 - Local Access Window 7 Attributes Register */ uint lawar7; /* 0xcf0 - Local Access Window 7 Attributes Register */
char res20[780]; /* XXX: LAW 8, LAW9 for 8572 */ char res19_8a[20];
uint lawbar8; /* 0xd08 - Local Access Window 8 Base Address Register */
char res19_8b[4];
uint lawar8; /* 0xd10 - Local Access Window 8 Attributes Register */
char res19_9a[20];
uint lawbar9; /* 0xd28 - Local Access Window 9 Base Address Register */
char res19_9b[4];
uint lawar9; /* 0xd30 - Local Access Window 9 Attributes Register */
char res19_10a[20];
uint lawbar10; /* 0xd48 - Local Access Window 10 Base Address Register */
char res19_10b[4];
uint lawar10; /* 0xd50 - Local Access Window 10 Attributes Register */
char res19_11a[20];
uint lawbar11; /* 0xd68 - Local Access Window 11 Base Address Register */
char res19_11b[4];
uint lawar11; /* 0xd70 - Local Access Window 11 Attributes Register */
char res20[652];
uint eebacr; /* 0x1000 - ECM CCB Address Configuration Register */ uint eebacr; /* 0x1000 - ECM CCB Address Configuration Register */
char res21[12]; char res21[12];
uint eebpcr; /* 0x1010 - ECM CCB Port Configuration Register */ uint eebpcr; /* 0x1010 - ECM CCB Port Configuration Register */
@ -119,7 +135,12 @@ typedef struct ccsr_ddr {
uint ddr_sr_cntr; /* 0x217C - DDR self refresh counter */ uint ddr_sr_cntr; /* 0x217C - DDR self refresh counter */
uint ddr_sdram_rcw_1; /* 0x2180 - DDR Register Control Words 1 */ uint ddr_sdram_rcw_1; /* 0x2180 - DDR Register Control Words 1 */
uint ddr_sdram_rcw_2; /* 0x2184 - DDR Register Control Words 2 */ uint ddr_sdram_rcw_2; /* 0x2184 - DDR Register Control Words 2 */
char res8_1b[2672]; char res8_1b[2456];
uint ddr_dsr1; /* 0x2B20 - DDR Debug Status Register 1 */
uint ddr_dsr2; /* 0x2B24 - DDR Debug Status Register 2 */
uint ddr_cdr1; /* 0x2B28 - DDR Control Driver Register 1 */
uint ddr_cdr2; /* 0x2B2C - DDR Control Driver Register 2 */
char res8_1c[200];
uint ip_rev1; /* 0x2BF8 - DDR IP Block Revision 1 */ uint ip_rev1; /* 0x2BF8 - DDR IP Block Revision 1 */
uint ip_rev2; /* 0x2BFC - DDR IP Block Revision 2 */ uint ip_rev2; /* 0x2BFC - DDR IP Block Revision 2 */
char res8_2[512]; char res8_2[512];

2
include/asm-ppc/processor.h
View file

@ -951,6 +951,8 @@
#define SVR_8568_E 0x807D00 #define SVR_8568_E 0x807D00
#define SVR_8572 0x80E000 #define SVR_8572 0x80E000
#define SVR_8572_E 0x80E800 #define SVR_8572_E 0x80E800
#define SVR_P2020 0x80E200
#define SVR_P2020_E 0x80EA00
#define SVR_8610 0x80A000 #define SVR_8610 0x80A000
#define SVR_8641 0x809000 #define SVR_8641 0x809000