mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-01-06 02:33:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge git://git.denx.de/u-boot-mpc85xx

Browse Source
This commit is contained in:
Tom Rini 2017-05-16 14:50:36 -04:00
commit a9f47426ce
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/powerpc/cpu/mpc85xx/t1024_serdes.c
View File

@ -10,7 +10,7 @@
#include <asm/io.h>
static u8 serdes_cfg_tbl[][4] = {
static u8 serdes_cfg_tbl[][SRDS_MAX_LANES] = {
[0x40] = {PCIE1, PCIE1, PCIE1, PCIE1},
[0xD5] = {QSGMII_FM1_A, PCIE3, PCIE2, PCIE1},
[0xD6] = {QSGMII_FM1_A, PCIE3, PCIE2, SATA1},
@ -45,7 +45,7 @@ int is_serdes_prtcl_valid(int serdes, u32 prtcl)
if (prtcl >= ARRAY_SIZE(serdes_cfg_tbl))
return 0;
for (i = 0; i < 4; i++) {
for (i = 0; i < SRDS_MAX_LANES; i++) {
if (serdes_cfg_tbl[prtcl][i] != NONE)
return 1;
}

4
arch/powerpc/include/asm/immap_85xx.h
View File

@ -2523,7 +2523,11 @@ typedef struct ccsr_gur {
#ifdef CONFIG_SYS_FSL_QORIQ_CHASSIS2
#define MAX_SERDES 4
#if defined(CONFIG_ARCH_T1024) || defined(CONFIG_ARCH_T1023)
#define SRDS_MAX_LANES 4
#else
#define SRDS_MAX_LANES 8
#endif
#define SRDS_MAX_BANK 2
typedef struct serdes_corenet {
struct {