toradex: tdx-cfg-clock: fix i.mx 8m mini interactive

Now with them first Verdin iMX8M Mini DualLite modules in for bring-up
we got clarity how is_cpu_type() actually behaves.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Reviewed-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>

diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c
index 475abf7..adab0a0 100644 (file)
--- a/board/toradex/common/tdx-cfg-block.c
+++ b/board/toradex/common/tdx-cfg-block.c
@@ -423,12 +423,6 @@ static int get_cfgblock_interactive(void)
                tdx_hw_tag.prodid = COLIBRI_IMX7D;
        else if (!strcmp("imx7s", soc))
                tdx_hw_tag.prodid = COLIBRI_IMX7S;
-       else if (is_cpu_type(MXC_CPU_IMX8MM))
-               tdx_hw_tag.prodid = VERDIN_IMX8MMQ_WIFI_BT_IT;
-       else if (is_cpu_type(MXC_CPU_IMX8MMDL))
-               tdx_hw_tag.prodid = VERDIN_IMX8MMDL;
-       else if (is_cpu_type(MXC_CPU_IMX8MN))
-               tdx_hw_tag.prodid = VERDIN_IMX8MNQ_WIFI_BT;
        else if (is_cpu_type(MXC_CPU_IMX8QM)) {
                if (it == 'y' || it == 'Y') {
                        if (wb == 'y' || wb == 'Y')
@@ -464,18 +458,16 @@ static int get_cfgblock_interactive(void)
                                tdx_hw_tag.prodid = COLIBRI_IMX8DX;
                }
 #endif
+       } else if (is_cpu_type(MXC_CPU_IMX8MMDL)) {
+               if (wb == 'y' || wb == 'Y')
+                       tdx_hw_tag.prodid = VERDIN_IMX8MMDL_WIFI_BT_IT;
+               else
+                       tdx_hw_tag.prodid = VERDIN_IMX8MMDL;
        } else if (is_cpu_type(MXC_CPU_IMX8MM)) {
-               if (is_cpu_type(MXC_CPU_IMX8MMDL)) {
-                       if (wb == 'y' || wb == 'Y')
-                               tdx_hw_tag.prodid = VERDIN_IMX8MMDL_WIFI_BT_IT;
-                       else
-                               tdx_hw_tag.prodid = VERDIN_IMX8MMDL;
-               } else {
-                       if (wb == 'y' || wb == 'Y')
-                               tdx_hw_tag.prodid = VERDIN_IMX8MMQ_WIFI_BT_IT;
-                       else
-                               tdx_hw_tag.prodid = VERDIN_IMX8MMQ_IT;
-               }
+               if (wb == 'y' || wb == 'Y')
+                       tdx_hw_tag.prodid = VERDIN_IMX8MMQ_WIFI_BT_IT;
+               else
+                       tdx_hw_tag.prodid = VERDIN_IMX8MMQ_IT;
        } else if (is_cpu_type(MXC_CPU_IMX8MN)) {
                tdx_hw_tag.prodid = VERDIN_IMX8MNQ_WIFI_BT;
        } else if (is_cpu_type(MXC_CPU_IMX8MP)) {