[PATCH v1 8/9] toradex: tdx-cfg-clock: fix i.mx 8m mini interactive

2020-12-08 Thread sbabic 
> From: Marcel Ziswiler 
> 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 
> Reviewed-by: Oleksandr Suvorov 
Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

-- 
=
DENX Software Engineering GmbH,  Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de
=

Re: [PATCH v1 8/9] toradex: tdx-cfg-clock: fix i.mx 8m mini interactive

2020-10-29 Thread Oleksandr Suvorov 
On Wed, Oct 28, 2020 at 11:59 AM Igor Opaniuk  wrote:
>
> From: Marcel Ziswiler 
>
> 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 

Reviewed-by: Oleksandr Suvorov 

with a note: the commit message seems to have a typo s/them/the/, isn't it?

> ---
>
>  board/toradex/common/tdx-cfg-block.c | 26 +-
>  1 file changed, 9 insertions(+), 17 deletions(-)
>
> diff --git a/board/toradex/common/tdx-cfg-block.c 
> b/board/toradex/common/tdx-cfg-block.c
> index 475abf78a7..adab0a0802 100644
> --- 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)) {
> --
> 2.17.1
>


-- 
Best regards
Oleksandr Suvorov

Toradex AG
Ebenaustrasse 10 | 6048 Horw | Switzerland | T: +41 41 500 48 00

[PATCH v1 8/9] toradex: tdx-cfg-clock: fix i.mx 8m mini interactive

2020-10-28 Thread Igor Opaniuk 
From: Marcel Ziswiler 

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 
---

 board/toradex/common/tdx-cfg-block.c | 26 +-
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/board/toradex/common/tdx-cfg-block.c 
b/board/toradex/common/tdx-cfg-block.c
index 475abf78a7..adab0a0802 100644
--- 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)) {
-- 
2.17.1