linux-sunxi/u-boot-sunxi
1
0
Fork 0
mirror of https://github.com/linux-sunxi/u-boot-sunxi.git synced 2024-02-12 11:16:03 +08:00
Code Issues Projects Releases Wiki Activity

powerpc: t1024: Fix SRDS_MAX_LANES value

Browse Source 
T1023 and T1024 have 4 SerDes lanes. Fix macro SRDS_MAX_LANES
and use this macro instead of hard-coded value in t1024_serdes.c.

Signed-off-by: Paulo Zaneti <paulo.zaneti@datacom.ind.br>
Signed-off-by: York Sun <york.sun@nxp.com>
This commit is contained in:
Paulo Zaneti
2017-05-05 11:08:18 -03:00
committed by York Sun
parent 22f3368e71
commit fbe44dd1aa
2 changed files with 6 additions and 2 deletions
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> #include <asm/io.h>
static u8 serdes_cfg_tbl[][4] = { static u8 serdes_cfg_tbl[][SRDS_MAX_LANES] = {
[0x40] = {PCIE1, PCIE1, PCIE1, PCIE1}, [0x40] = {PCIE1, PCIE1, PCIE1, PCIE1},
[0xD5] = {QSGMII_FM1_A, PCIE3, PCIE2, PCIE1}, [0xD5] = {QSGMII_FM1_A, PCIE3, PCIE2, PCIE1},
[0xD6] = {QSGMII_FM1_A, PCIE3, PCIE2, SATA1}, [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)) if (prtcl >= ARRAY_SIZE(serdes_cfg_tbl))
return 0; return 0;
for (i = 0; i < 4; i++) { for (i = 0; i < SRDS_MAX_LANES; i++) {
if (serdes_cfg_tbl[prtcl][i] != NONE) if (serdes_cfg_tbl[prtcl][i] != NONE)
return 1; 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 #ifdef CONFIG_SYS_FSL_QORIQ_CHASSIS2
#define MAX_SERDES 4 #define MAX_SERDES 4
#if defined(CONFIG_ARCH_T1024) || defined(CONFIG_ARCH_T1023)
#define SRDS_MAX_LANES 4
#else
#define SRDS_MAX_LANES 8 #define SRDS_MAX_LANES 8
#endif
#define SRDS_MAX_BANK 2 #define SRDS_MAX_BANK 2
typedef struct serdes_corenet { typedef struct serdes_corenet {
struct { struct {