powerpc/85xx: Move p1022ds slot code into board file
PATCH 1/1 powerpc/85xx: Move p1022ds slot code into board file
The code to map SERDES configs to slot names is board specific and not chip specific. Thus it should live in board/freescale/p1022ds/ and not in arch/powerpc/cpu/.
Signed-off-by Kumar Gala <[email protected]>
--- arch/powerpc/cpu/mpc85xx/p1022_serdes.c | 68 ------------------------------ arch/powerpc/include/asm/fsl_serdes.h | 2 - board/freescale/p1022ds/p1022ds.c | 69 +++++++++++++++++++++++++++++++ 3 files changed, 69 insertions(+), 70 deletions(-)
arch/powerpc/cpu/mpc85xx/p1022_serdes.c +0 -68
@@ -71,55 +71,6 @@ static const u8 serdes2_cfg_tbl[][SRDS2_MAX_LANES] = { [0x1f] = {NONE, NONE}, }; -/* -* A list of PCI and SATA slots -*/ -enum slot_id { -SLOT_PCIE1 =1 , -SLOT_PCIE2 , -SLOT_PCIE3 , -SLOT_PCIE4 , -SLOT_PCIE5 , -SLOT_SATA1 , -SLOT_SATA2 -}; - -/* -* This array maps the slot identifiers to their names on the P1022DS board. -*/ -static const char *slot_names[] = { - [SLOT_PCIE1 ] ="Slot 1" , - [SLOT_PCIE2 ] ="Slot 2" , - [SLOT_PCIE3 ] ="Slot 3" , - [SLOT_PCIE4 ] ="Slot 4" , - [SLOT_PCIE5 ] ="Mini-PCIe" , - [SLOT_SATA1 ] ="SATA 1" , - [SLOT_SATA2 ] ="SATA 2" , -}; - -/* -* This array maps a given SERDES configuration and SERDES device to the PCI or -* SATA slot that it connects to. This mapping is hard-coded in the FPGA. -*/ -static u8 serdes_dev_slot[][SATA2 +1 ] = { - [0x01 ] = { [PCIE3 ] =SLOT_PCIE4 , [PCIE2 ] =SLOT_PCIE5 }, - [0x02 ] = { [SATA1 ] =SLOT_SATA1 , [SATA2 ] =SLOT_SATA2 }, - [0x09 ] = { [PCIE1 ] =SLOT_PCIE1 , [PCIE3 ] =SLOT_PCIE4 , - [PCIE2 ] =SLOT_PCIE5 }, - [0x16 ] = { [PCIE1 ] =SLOT_PCIE1 , [PCIE3 ] =SLOT_PCIE2 , - [PCIE2 ] =SLOT_PCIE3 , - [SATA1 ] =SLOT_SATA1 , [SATA2 ] =SLOT_SATA2 }, - [0x17 ] = { [PCIE1 ] =SLOT_PCIE1 , [PCIE3 ] =SLOT_PCIE2 , - [PCIE2 ] =SLOT_PCIE3 }, - [0x1a ] = { [PCIE1 ] =SLOT_PCIE1 , [PCIE2 ] =SLOT_PCIE3 , - [PCIE2 ] =SLOT_PCIE3 , - [SATA1 ] =SLOT_SATA1 , [SATA2 ] =SLOT_SATA2 }, - [0x1c ] = { [PCIE1 ] =SLOT_PCIE1 , - [SATA1 ] =SLOT_SATA1 , [SATA2 ] =SLOT_SATA2 }, - [0x1e ] = { [PCIE1 ] =SLOT_PCIE1 , [PCIE3 ] =SLOT_PCIE3 }, - [0x1f ] = { [PCIE1 ] =SLOT_PCIE1 }, -}; -int is_serdes_configured (enum srds_prtcl device) {ccsr_gur_t *gur = (void *)CONFIG_SYS_MPC85xx_GUTS_ADDR;
@@ -145,22 +96,3 @@ int is_serdes_configured(enum srds_prtcl device)return 0 ; } - -/* -* Returns the name of the slot to which the PCIe or SATA controller is -* connected -*/ -const char *serdes_slot_name (enum srds_prtcl device) -{ -ccsr_gur_t *gur = (void *)CONFIG_SYS_MPC85xx_GUTS_ADDR; -u32 pordevsr =in_be32 (&gur->pordevsr); -unsigned int srds_cfg = (pordevsr & MPC85xx_PORDEVSR_IO_SEL) >> - MPC85xx_PORDEVSR_IO_SEL_SHIFT; -enum slot_id slot = serdes_dev_slot[srds_cfg][device]; -const char *name = slot_names[slot]; - -if (name) -return name; -else -return "Nothing" ; -}
arch/powerpc/include/asm/fsl_serdes.h +0 -2
@@ -45,6 +45,4 @@ enum srds_prtcl {int is_serdes_configured (enum srds_prtcl device); -const char *serdes_slot_name (enum srds_prtcl device); -#endif /* __FSL_SERDES_H */
board/freescale/p1022ds/p1022ds.c +69 -0
75 lines not on this page · raw message
Signature · 1 line
1.6.0.6
Kumar Gala
AppliedPATCH 1/1 powerpc/85xx: Move p1022ds slot code into board file
Quoted 10 lines · Kumar Gala
The code to map SERDES configs to slot names is board specific and not chip specific. Thus it should live in board/freescale/p1022ds/ and not in
arch/powerpc/cpu/.Signed-off-by Kumar Gala <[email protected]>---
arch/powerpc/cpu/mpc85xx/p1022_serdes.c | 68 ------------------------------ arch/powerpc/include/asm/fsl_serdes.h | 2 - board/freescale/p1022ds/p1022ds.c | 69 +++++++++++++++++++++++++++++++ 3 files changed, 69 insertions(+), 70 deletions(-)
applied to 85xx
- k