arm: mvebu: clearfog: Use Pro DT by default

[oweals/u-boot.git] / board / solidrun / clearfog / clearfog.c

diff --git a/board/solidrun/clearfog/clearfog.c b/board/solidrun/clearfog/clearfog.c
index e178b06cd34d3f19b452aafa62a3ad416c5daa90..443751ba8fc08a2017c0b0ea612b38572e1af627 100644 (file)
--- a/board/solidrun/clearfog/clearfog.c
+++ b/board/solidrun/clearfog/clearfog.c
@@ -42,6 +42,7 @@ static void cf_read_tlv_data(void)
        read_tlv_data(&cf_tlv_data);
 }
 
+/* The starting board_serdes_map reflects original Clearfog Pro usage */
 static struct serdes_map board_serdes_map[] = {
        {SATA0, SERDES_SPEED_3_GBPS, SERDES_DEFAULT_MODE, 0, 0},
        {SGMII1, SERDES_SPEED_1_25_GBPS, SERDES_DEFAULT_MODE, 0, 0},
@@ -51,8 +52,62 @@ static struct serdes_map board_serdes_map[] = {
        {SGMII2, SERDES_SPEED_1_25_GBPS, SERDES_DEFAULT_MODE, 0, 0},
 };
 
+void config_cfbase_serdes_map(void)
+{
+       board_serdes_map[4].serdes_type = USB3_HOST0;
+       board_serdes_map[4].serdes_speed = SERDES_SPEED_5_GBPS;
+       board_serdes_map[4].serdes_mode = SERDES_DEFAULT_MODE;
+}
+
 int hws_board_topology_load(struct serdes_map **serdes_map_array, u8 *count)
 {
+       cf_read_tlv_data();
+
+       /* Apply build configuration options before runtime configuration */
+       if (IS_ENABLED(CONFIG_CLEARFOG_SFP_25GB))
+               board_serdes_map[5].serdes_speed = SERDES_SPEED_3_125_GBPS;
+
+       if (IS_ENABLED(CONFIG_CLEARFOG_CON2_SATA)) {
+               board_serdes_map[4].serdes_type = SATA2;
+               board_serdes_map[4].serdes_speed = SERDES_SPEED_3_GBPS;
+               board_serdes_map[4].serdes_mode = SERDES_DEFAULT_MODE;
+               board_serdes_map[4].swap_rx = 1;
+       }
+
+       if (IS_ENABLED(CONFIG_CLEARFOG_CON3_SATA)) {
+               board_serdes_map[2].serdes_type = SATA1;
+               board_serdes_map[2].serdes_speed = SERDES_SPEED_3_GBPS;
+               board_serdes_map[2].serdes_mode = SERDES_DEFAULT_MODE;
+               board_serdes_map[2].swap_rx = 1;
+       }
+
+       /* Apply runtime detection changes */
+       if (sr_product_is(&cf_tlv_data, "Clearfog GTR")) {
+               board_serdes_map[0].serdes_type = PEX0;
+               board_serdes_map[0].serdes_speed = SERDES_SPEED_5_GBPS;
+               board_serdes_map[0].serdes_mode = PEX_ROOT_COMPLEX_X1;
+       } else if (sr_product_is(&cf_tlv_data, "Clearfog Pro")) {
+               /* handle recognized product as noop, no adjustment required */
+       } else if (sr_product_is(&cf_tlv_data, "Clearfog Base")) {
+               config_cfbase_serdes_map();
+       } else {
+               /*
+                * Fallback to static default. EEPROM TLV support is not
+                * enabled, runtime detection failed, hardware support is not
+                * present, EEPROM is corrupt, or an unrecognized product name
+                * is present.
+                */
+               if (IS_ENABLED(CONFIG_SPL_CMD_TLV_EEPROM))
+                       puts("EEPROM TLV detection failed: ");
+               puts("Using static config for ");
+               if (IS_ENABLED(CONFIG_TARGET_CLEARFOG_BASE)) {
+                       puts("Clearfog Base.\n");
+                       config_cfbase_serdes_map();
+               } else {
+                       puts("Clearfog Pro.\n");
+               }
+       }
+
        *serdes_map_array = board_serdes_map;
        *count = ARRAY_SIZE(board_serdes_map);
        return 0;
@@ -156,7 +211,9 @@ int board_init(void)
 
 int checkboard(void)
 {
-       char *board = "ClearFog";
+       char *board = "Clearfog Pro";
+       if (IS_ENABLED(CONFIG_TARGET_CLEARFOG_BASE))
+               board = "Clearfog Base";
 
        cf_read_tlv_data();
        if (strlen(cf_tlv_data.tlv_product_name[0]) > 0)
@@ -186,6 +243,10 @@ int board_late_init(void)
                env_set("fdtfile", "armada-385-clearfog-gtr-s4.dtb");
        else if (sr_product_is(&cf_tlv_data, "Clearfog GTR L8"))
                env_set("fdtfile", "armada-385-clearfog-gtr-l8.dtb");
+       else if (IS_ENABLED(CONFIG_TARGET_CLEARFOG_BASE))
+               env_set("fdtfile", "armada-388-clearfog-base.dtb");
+       else
+               env_set("fdtfile", "armada-388-clearfog-pro.dtb");
 
        return 0;
 }