arm: mvebu: clearfog: initial ClearFog Base variant

Add a unique entry for ClearFog Base variant, reflected in the board
name and adjusted SerDes topology.

Signed-off-by: Joel Johnson <mrjoel@lixil.net>
Reviewed-by: Stefan Roese <sr@denx.de>

diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
index bc5eaa5a767962757bff081928c45d005022f745..161dee937fa04ae4e5d3e684c31117c03ca80eb7 100644 (file)
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@ -280,4 +280,6 @@ config SECURED_MODE_CSK_INDEX
        default 0
        depends on SECURED_MODE_IMAGE
 
+source "board/solidrun/clearfog/Kconfig"
+
 endif

diff --git a/board/solidrun/clearfog/Kconfig b/board/solidrun/clearfog/Kconfig
new file mode 100644 (file)
index 0000000..936d591
--- /dev/null
+++ b/board/solidrun/clearfog/Kconfig
@@ -0,0 +1,18 @@
+menu "ClearFog configuration"
+       depends on TARGET_CLEARFOG
+
+config TARGET_CLEARFOG_BASE
+       bool "Use ClearFog Base static configuration"
+       help
+         Use the ClearFog Base as the static configuration instead of the
+         default which uses the ClearFog Pro.
+
+         Runtime board detection is always attempted and used if available. The
+         static configuration is used as a fallback in cases where runtime
+         detection is disabled, is not available in hardware, or otherwise fails.
+
+         Only newer revisions of the ClearFog product line support runtime
+         detection via additional EEPROM hardware. This option enables selecting
+         the Base variant for older hardware revisions.
+
+endmenu

diff --git a/board/solidrun/clearfog/clearfog.c b/board/solidrun/clearfog/clearfog.c
index 9b31902c7045d9a745df0754aeda40e12adedbc8..11d3a7f877bcdf3c2523093d4c5b8959f093d626 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,6 +52,13 @@ 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();
@@ -59,12 +67,26 @@ int hws_board_topology_load(struct serdes_map **serdes_map_array, u8 *count)
                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;
-       }
-
-       if (sr_product_is(&cf_tlv_data, "Clearfog Base")) {
-               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;
+       } 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;
@@ -171,6 +193,8 @@ int board_init(void)
 int checkboard(void)
 {
        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)
@@ -200,6 +224,8 @@ 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");
 
        return 0;
 }