leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arm: mvebu: turris_omnia: Define only one serdes map variable

Browse Source 
By default use primary serdes map with PCIe function in combined
miniPCIe/mSATA slot. When SATA is detected change serdes map variable at
runtime.

Signed-off-by: Pali Rohár <pali@kernel.org>
This commit is contained in:
Pali Rohár
2022-03-02 12:47:54 +01:00
committed by Stefan Roese
parent f9c5cf8a88
commit 8ead243ecc
1 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
board/CZ.NIC/turris_omnia/turris_omnia.c
View File

@@ -86,7 +86,7 @@ enum status_word_bits {
#define OMNIA_GPP_POL_LOW 0x0 #define OMNIA_GPP_POL_LOW 0x0
#define OMNIA_GPP_POL_MID 0x0 #define OMNIA_GPP_POL_MID 0x0
static struct serdes_map board_serdes_map_pex[] = { static struct serdes_map board_serdes_map[] = {
{PEX0, SERDES_SPEED_5_GBPS, PEX_ROOT_COMPLEX_X1, 0, 0}, {PEX0, SERDES_SPEED_5_GBPS, PEX_ROOT_COMPLEX_X1, 0, 0},
{USB3_HOST0, SERDES_SPEED_5_GBPS, SERDES_DEFAULT_MODE, 0, 0}, {USB3_HOST0, SERDES_SPEED_5_GBPS, SERDES_DEFAULT_MODE, 0, 0},
{PEX1, SERDES_SPEED_5_GBPS, PEX_ROOT_COMPLEX_X1, 0, 0}, {PEX1, SERDES_SPEED_5_GBPS, PEX_ROOT_COMPLEX_X1, 0, 0},
@@ -95,15 +95,6 @@ static struct serdes_map board_serdes_map_pex[] = {
{SGMII2, SERDES_SPEED_1_25_GBPS, SERDES_DEFAULT_MODE, 0, 0} {SGMII2, SERDES_SPEED_1_25_GBPS, SERDES_DEFAULT_MODE, 0, 0}
}; };
static struct serdes_map board_serdes_map_sata[] = {
{SATA0, SERDES_SPEED_6_GBPS, SERDES_DEFAULT_MODE, 0, 0},
{USB3_HOST0, SERDES_SPEED_5_GBPS, SERDES_DEFAULT_MODE, 0, 0},
{PEX1, SERDES_SPEED_5_GBPS, PEX_ROOT_COMPLEX_X1, 0, 0},
{USB3_HOST1, SERDES_SPEED_5_GBPS, SERDES_DEFAULT_MODE, 0, 0},
{PEX2, SERDES_SPEED_5_GBPS, PEX_ROOT_COMPLEX_X1, 0, 0},
{SGMII2, SERDES_SPEED_1_25_GBPS, SERDES_DEFAULT_MODE, 0, 0}
};
static struct udevice *omnia_get_i2c_chip(const char *name, uint addr, static struct udevice *omnia_get_i2c_chip(const char *name, uint addr,
uint offset_len) uint offset_len)
{ {
@@ -249,13 +240,15 @@ void *env_sf_get_env_addr(void)
int hws_board_topology_load(struct serdes_map **serdes_map_array, u8 *count) int hws_board_topology_load(struct serdes_map **serdes_map_array, u8 *count)
{ {
if (omnia_detect_sata()) { if (omnia_detect_sata()) {
*serdes_map_array = board_serdes_map_sata; /* Change SerDes for first mPCIe port (mSATA) from PCIe to SATA */
*count = ARRAY_SIZE(board_serdes_map_sata); board_serdes_map[0].serdes_type = SATA0;
} else { board_serdes_map[0].serdes_speed = SERDES_SPEED_6_GBPS;
*serdes_map_array = board_serdes_map_pex; board_serdes_map[0].serdes_mode = SERDES_DEFAULT_MODE;
*count = ARRAY_SIZE(board_serdes_map_pex);
} }
*serdes_map_array = board_serdes_map;
*count = ARRAY_SIZE(board_serdes_map);
return 0; return 0;
} }