[PATCH v2 1/3] arm: dts: imx8mm: move firmware/optee node to common imx8mm-u-boot.dtsi

[Marcel Ziswiler]

Hi Tim

Thanks!

On Thu, 2023-08-24 at 12:01 -0700, Tim Harvey wrote:
> Move the firmware/optee node to the common imx8mm-u-boot.dtsi and
> protect it with an ifdef CONFIG_OPTEE as it is a meaningless node
> without the optee driver enabled.
> 
> Signed-off-by: Tim Harvey <tharvey at gateworks.com>
> Reviewed-by: Fabio Estevam <festevam at denx.de>

For the entire series.

Reviewed-by: Marcel Ziswiler <marcel.ziswiler at toradex.com>

> ---
> v2: added Fabio's rb tag
> ---
>  arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi | 7 -------
>  arch/arm/dts/imx8mm-cl-iot-gate-u-boot.dtsi       | 7 -------
>  arch/arm/dts/imx8mm-evk-u-boot.dtsi               | 7 -------
>  arch/arm/dts/imx8mm-kontron-bl-common-u-boot.dtsi | 7 -------
>  arch/arm/dts/imx8mm-phg-u-boot.dtsi               | 7 -------
>  arch/arm/dts/imx8mm-u-boot.dtsi                   | 9 +++++++++
>  arch/arm/dts/imx8mm-verdin-wifi-dev-u-boot.dtsi   | 7 -------
>  7 files changed, 9 insertions(+), 42 deletions(-)
> 
> diff --git a/arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi b/arch/arm/dts/imx8mm-cl-iot-gate-optee-u-
> boot.dtsi
> index 484e31824b85..d12ce6069cc7 100644
> --- a/arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi
> +++ b/arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi
> @@ -6,13 +6,6 @@
>  #include "imx8mm-u-boot.dtsi"
>  
>  / {
> -       firmware {
> -               optee {
> -                       compatible = "linaro,optee-tz";
> -                       method = "smc";
> -               };
> -       };
> -
>         wdt-reboot {
>                 compatible = "wdt-reboot";
>                 bootph-pre-ram;
> diff --git a/arch/arm/dts/imx8mm-cl-iot-gate-u-boot.dtsi b/arch/arm/dts/imx8mm-cl-iot-gate-u-boot.dtsi
> index 1878c4e13fbe..219504f61105 100644
> --- a/arch/arm/dts/imx8mm-cl-iot-gate-u-boot.dtsi
> +++ b/arch/arm/dts/imx8mm-cl-iot-gate-u-boot.dtsi
> @@ -6,13 +6,6 @@
>  #include "imx8mm-u-boot.dtsi"
>  
>  / {
> -       firmware {
> -               optee {
> -                       compatible = "linaro,optee-tz";
> -                       method = "smc";
> -               };
> -       };
> -
>         wdt-reboot {
>                 compatible = "wdt-reboot";
>                 bootph-pre-ram;
> diff --git a/arch/arm/dts/imx8mm-evk-u-boot.dtsi b/arch/arm/dts/imx8mm-evk-u-boot.dtsi
> index 13688ec0d0f2..155670da18d1 100644
> --- a/arch/arm/dts/imx8mm-evk-u-boot.dtsi
> +++ b/arch/arm/dts/imx8mm-evk-u-boot.dtsi
> @@ -11,13 +11,6 @@
>                 wdt = <&wdog1>;
>                 bootph-pre-ram;
>         };
> -
> -       firmware {
> -               optee {
> -                       compatible = "linaro,optee-tz";
> -                       method = "smc";
> -               };
> -       };
>  };
>  
>  &aips4 {
> diff --git a/arch/arm/dts/imx8mm-kontron-bl-common-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-bl-common-u-
> boot.dtsi
> index 65dfd33725ee..1ad9d49a1118 100644
> --- a/arch/arm/dts/imx8mm-kontron-bl-common-u-boot.dtsi
> +++ b/arch/arm/dts/imx8mm-kontron-bl-common-u-boot.dtsi
> @@ -16,13 +16,6 @@
>                 wdt = <&wdog1>;
>                 bootph-pre-ram;
>         };
> -
> -       firmware {
> -               optee {
> -                       compatible = "linaro,optee-tz";
> -                       method = "smc";
> -               };
> -       };
>  };
>  
>  &crypto {
> diff --git a/arch/arm/dts/imx8mm-phg-u-boot.dtsi b/arch/arm/dts/imx8mm-phg-u-boot.dtsi
> index 3ced97cfaafa..c9e0b4420500 100644
> --- a/arch/arm/dts/imx8mm-phg-u-boot.dtsi
> +++ b/arch/arm/dts/imx8mm-phg-u-boot.dtsi
> @@ -11,13 +11,6 @@
>                 wdt = <&wdog1>;
>                 bootph-pre-ram;
>         };
> -
> -       firmware {
> -               optee {
> -                       compatible = "linaro,optee-tz";
> -                       method = "smc";
> -               };
> -       };
>  };
>  
>  &aips4 {
> diff --git a/arch/arm/dts/imx8mm-u-boot.dtsi b/arch/arm/dts/imx8mm-u-boot.dtsi
> index 035282bf0b00..a843bb851eaf 100644
> --- a/arch/arm/dts/imx8mm-u-boot.dtsi
> +++ b/arch/arm/dts/imx8mm-u-boot.dtsi
> @@ -7,6 +7,15 @@
>         binman: binman {
>                 multiple-images;
>         };
> +
> +#ifdef CONFIG_OPTEE
> +       firmware {
> +               optee {
> +                       compatible = "linaro,optee-tz";
> +                       method = "smc";
> +               };
> +       };
> +#endif
>  };
>  
>  &soc {
> diff --git a/arch/arm/dts/imx8mm-verdin-wifi-dev-u-boot.dtsi b/arch/arm/dts/imx8mm-verdin-wifi-dev-u-
> boot.dtsi
> index 2b268f55cb95..24e565a06c2f 100644
> --- a/arch/arm/dts/imx8mm-verdin-wifi-dev-u-boot.dtsi
> +++ b/arch/arm/dts/imx8mm-verdin-wifi-dev-u-boot.dtsi
> @@ -6,13 +6,6 @@
>  #include "imx8mm-u-boot.dtsi"
>  
>  / {
> -       firmware {
> -               optee {
> -                       compatible = "linaro,optee-tz";
> -                       method = "smc";
> -               };
> -       };
> -
>         wdt-reboot {
>                 compatible = "wdt-reboot";
>                 bootph-pre-ram;

Cheers

Marcel