From 4b72b1453285ca134bfaef37d203546b770f27ab Mon Sep 17 00:00:00 2001 From: Emanuele Ghidoli Date: Fri, 12 May 2023 14:24:51 +0200 Subject: toradex: tdx-cfg-block: add 0070 verdin i.mx 8m plus quad sku Add new i.MX 8M Plus Quad SKU to ConfigBlock handling. 0070: Verdin iMX8M Plus Quad 8GB WB IT This SKU is identical to 0066 but with Industrial Temperature Grade SoC. Upstream-Status: Submitted [https://lore.kernel.org/all/20230515130641.26028-1-francesco@dolcini.it/] Signed-off-by: Emanuele Ghidoli --- board/toradex/common/tdx-cfg-block.c | 7 ++++++- board/toradex/common/tdx-cfg-block.h | 2 ++ board/toradex/verdin-imx8mp/verdin-imx8mp.c | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c index 5d942b9db9..66e3cfd35b 100644 --- a/board/toradex/common/tdx-cfg-block.c +++ b/board/toradex/common/tdx-cfg-block.c @@ -150,6 +150,8 @@ const char * const toradex_modules[] = { [66] = "Verdin iMX8M Plus Quad 8GB Wi-Fi / BT", [67] = "Apalis iMX8 QuadMax 8GB Wi-Fi / BT IT", [68] = "Verdin iMX8M Mini Quad 2GB WB IT No CAN", + [69] = "UNKNOWN MODULE", + [70] = "Verdin iMX8M Plus Quad 8GB WB IT", }; const char * const toradex_carrier_boards[] = { @@ -553,7 +555,10 @@ static int get_cfgblock_interactive(void) if (gd->ram_size == 0x80000000) tdx_hw_tag.prodid = VERDIN_IMX8MPQ_2GB_WIFI_BT_IT; else if (gd->ram_size == 0x200000000) - tdx_hw_tag.prodid = VERDIN_IMX8MPQ_8GB_WIFI_BT; + if (it == 'y' || it == 'Y') + tdx_hw_tag.prodid = VERDIN_IMX8MPQ_8GB_WIFI_BT_IT; + else + tdx_hw_tag.prodid = VERDIN_IMX8MPQ_8GB_WIFI_BT; else tdx_hw_tag.prodid = VERDIN_IMX8MPQ_WIFI_BT_IT; else diff --git a/board/toradex/common/tdx-cfg-block.h b/board/toradex/common/tdx-cfg-block.h index 79cd09c78d..53c572ce9e 100644 --- a/board/toradex/common/tdx-cfg-block.h +++ b/board/toradex/common/tdx-cfg-block.h @@ -89,6 +89,8 @@ enum { VERDIN_IMX8MPQ_8GB_WIFI_BT, APALIS_IMX8QM_8GB_WIFI_BT_IT, VERDIN_IMX8MMQ_WIFI_BT_IT_NO_CAN, + /* 69 */ + VERDIN_IMX8MPQ_8GB_WIFI_BT_IT = 70, }; enum { diff --git a/board/toradex/verdin-imx8mp/verdin-imx8mp.c b/board/toradex/verdin-imx8mp/verdin-imx8mp.c index 44b9d82962..cdc28341ce 100644 --- a/board/toradex/verdin-imx8mp/verdin-imx8mp.c +++ b/board/toradex/verdin-imx8mp/verdin-imx8mp.c @@ -345,7 +345,8 @@ static void select_dt_from_module_version(void) */ is_wifi = (tdx_hw_tag.prodid == VERDIN_IMX8MPQ_WIFI_BT_IT) || (tdx_hw_tag.prodid == VERDIN_IMX8MPQ_2GB_WIFI_BT_IT) || - (tdx_hw_tag.prodid == VERDIN_IMX8MPQ_8GB_WIFI_BT); + (tdx_hw_tag.prodid == VERDIN_IMX8MPQ_8GB_WIFI_BT) || + (tdx_hw_tag.prodid == VERDIN_IMX8MPQ_8GB_WIFI_BT_IT); #endif if (is_wifi) -- cgit v1.2.3