toradex: tdx-cfg-block: rework display adapter name handling

Rework the rather big array of zero length strings with 4 entries of
actual display adapter names to a array of structs which ties a pid4
to its correspondent human readable string.
Provide an accessor to get the string for a given PID4.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Signed-off-by: Andrejs Cainikovs <andrejs.cainikovs@toradex.com>

diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c
index 98a2d44ed3e8ad16c4eabbcda39d19f4548d74fb..12a558c7bba673252969f95e1d20c0b59028a78f 100644 (file)
--- a/board/toradex/common/tdx-cfg-block.c
+++ b/board/toradex/common/tdx-cfg-block.c
@@ -155,10 +155,11 @@ const struct pid4list toradex_carrier_boards[] = {
        {YAVIA,                         "Yavia"},
 };
 
-const char * const toradex_display_adapters[] = {
-       [0] = "UNKNOWN DISPLAY ADAPTER",
-       [157] = "Verdin DSI to HDMI Adapter",
-       [159] = "Verdin DSI to LVDS Adapter",
+const struct pid4list toradex_display_adapters[] = {
+       /* the code assumes unknown at index 0 */
+       {0,                             "UNKNOWN DISPLAY ADAPTER"},
+       {VERDIN_DSI_TO_HDMI_ADAPTER,    "Verdin DSI to HDMI Adapter"},
+       {VERDIN_DSI_TO_LVDS_ADAPTER,    "Verdin DSI to LVDS Adapter"},
 };
 
 const u32 toradex_ouis[] = {
@@ -179,6 +180,19 @@ const char * const get_toradex_carrier_boards(int pid4)
        return toradex_carrier_boards[index].name;
 }
 
+const char * const get_toradex_display_adapters(int pid4)
+{
+       int i, index = 0;
+
+       for (i = 1; i < ARRAY_SIZE(toradex_display_adapters); i++) {
+               if (pid4 == toradex_display_adapters[i].pid4) {
+                       index = i;
+                       break;
+               }
+       }
+       return toradex_display_adapters[index].name;
+}
+
 static u32 get_serial_from_mac(struct toradex_eth_addr *eth_addr)
 {
        int i;

diff --git a/board/toradex/common/tdx-cfg-block.h b/board/toradex/common/tdx-cfg-block.h
index 7486ffbb54168348ae8ad9976df82062f4ca07bc..5dc9053ec0afbb4ef9c4fd57ec10493f36b83786 100644 (file)
--- a/board/toradex/common/tdx-cfg-block.h
+++ b/board/toradex/common/tdx-cfg-block.h
@@ -120,7 +120,7 @@ extern u32 tdx_car_serial;
 int read_tdx_cfg_block(void);
 int read_tdx_cfg_block_carrier(void);
 const char * const get_toradex_carrier_boards(int pid4);
-
+const char * const get_toradex_display_adapters(int pid4);
 int try_migrate_tdx_cfg_block_carrier(void);
 
 void get_mac_from_serial(u32 tdx_serial, struct toradex_eth_addr *eth_addr);