[PATCH v2] arm: dts: imx8m: move CAAM nodes into common u-boot.dtsi

[Marcel Ziswiler]

Hi Tim

Thanks!

On Thu, 2023-08-24 at 12:03 -0700, Tim Harvey wrote:
> Move the crypto and sec_jr* nodes from board-specific
> u-boot.dtsi files into the common files. Additionally protect the
> nodes with ifdef CONFIG_FSL_CAAM as they don't serve any purpose if
> that is not enabled.
> 
> Signed-off-by: Tim Harvey <tharvey at gateworks.com>

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

> ---
> v2:
>  - fix invalid ifdef
>  - add rb tags from Fabio and Peng
> ---
>  arch/arm/dts/imx8mm-evk-u-boot.dtsi           | 16 ---------------
>  .../dts/imx8mm-kontron-bl-common-u-boot.dtsi  | 16 ---------------
>  arch/arm/dts/imx8mm-u-boot.dtsi               | 20 +++++++++++++++++++
>  arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi      | 16 ---------------
>  arch/arm/dts/imx8mn-u-boot.dtsi               | 20 +++++++++++++++++++
>  arch/arm/dts/imx8mp-beacon-kit-u-boot.dtsi    | 16 ---------------
>  arch/arm/dts/imx8mp-evk-u-boot.dtsi           | 16 ---------------
>  .../imx8mp-icore-mx8mp-edimm2.2-u-boot.dtsi   | 16 ---------------
>  arch/arm/dts/imx8mp-u-boot.dtsi               | 20 +++++++++++++++++++
>  .../dts/imx8mp-verdin-wifi-dev-u-boot.dtsi    | 16 ---------------
>  10 files changed, 60 insertions(+), 112 deletions(-)
> 
> diff --git a/arch/arm/dts/imx8mm-evk-u-boot.dtsi b/arch/arm/dts/imx8mm-evk-u-boot.dtsi
> index 155670da18d1..9a5b0795133b 100644
> --- a/arch/arm/dts/imx8mm-evk-u-boot.dtsi
> +++ b/arch/arm/dts/imx8mm-evk-u-boot.dtsi
> @@ -65,22 +65,6 @@
>         bootph-pre-ram;
>  };
>  
> -&crypto {
> -       bootph-pre-ram;
> -};
> -
> -&sec_jr0 {
> -       bootph-pre-ram;
> -};
> -
> -&sec_jr1 {
> -       bootph-pre-ram;
> -};
> -
> -&sec_jr2 {
> -       bootph-pre-ram;
> -};
> -
>  &usbmisc1 {
>         bootph-pre-ram;
>  };
> 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 1ad9d49a1118..ae542fdcffad 100644
> --- a/arch/arm/dts/imx8mm-kontron-bl-common-u-boot.dtsi
> +++ b/arch/arm/dts/imx8mm-kontron-bl-common-u-boot.dtsi
> @@ -18,22 +18,6 @@
>         };
>  };
>  
> -&crypto {
> -       bootph-pre-ram;
> -};
> -
> -&sec_jr0 {
> -       bootph-pre-ram;
> -};
> -
> -&sec_jr1 {
> -       bootph-pre-ram;
> -};
> -
> -&sec_jr2 {
> -       bootph-pre-ram;
> -};
> -
>  &i2c1 {
>         bootph-pre-ram;
>         bootph-all;
> diff --git a/arch/arm/dts/imx8mm-u-boot.dtsi b/arch/arm/dts/imx8mm-u-boot.dtsi
> index a843bb851eaf..0bd7ad980b66 100644
> --- a/arch/arm/dts/imx8mm-u-boot.dtsi
> +++ b/arch/arm/dts/imx8mm-u-boot.dtsi
> @@ -18,6 +18,12 @@
>  #endif
>  };
>  
> +#ifdef CONFIG_FSL_CAAM
> +&crypto {
> +       bootph-pre-ram;
> +};
> +#endif
> +
>  &soc {
>         bootph-all;
>         bootph-pre-ram;
> @@ -216,6 +222,20 @@
>         bootph-pre-ram;
>  };
>  
> +#ifdef CONFIG_FSL_CAAM
> +&sec_jr0 {
> +       bootph-pre-ram;
> +};
> +
> +&sec_jr1 {
> +       bootph-pre-ram;
> +};
> +
> +&sec_jr2 {
> +       bootph-pre-ram;
> +};
> +#endif
> +
>  &spba1 {
>         bootph-all;
>         bootph-pre-ram;
> diff --git a/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi b/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi
> index 315714f39848..c31f3dec3de4 100644
> --- a/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi
> +++ b/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi
> @@ -57,22 +57,6 @@
>         bootph-pre-ram;
>  };
>  
> -&crypto {
> -       bootph-pre-ram;
> -};
> -
> -&sec_jr0 {
> -       bootph-pre-ram;
> -};
> -
> -&sec_jr1 {
> -       bootph-pre-ram;
> -};
> -
> -&sec_jr2 {
> -       bootph-pre-ram;
> -};
> -
>  &usdhc1 {
>         bootph-pre-ram;
>  };
> diff --git a/arch/arm/dts/imx8mn-u-boot.dtsi b/arch/arm/dts/imx8mn-u-boot.dtsi
> index 86c9a6cd67f0..3a9e4c16281e 100644
> --- a/arch/arm/dts/imx8mn-u-boot.dtsi
> +++ b/arch/arm/dts/imx8mn-u-boot.dtsi
> @@ -54,6 +54,12 @@
>         /delete-property/ assigned-clock-rates;
>  };
>  
> +#ifdef CONFIG_FSL_CAAM
> +&crypto {
> +       bootph-pre-ram;
> +};
> +#endif
> +
>  &iomuxc {
>         bootph-pre-ram;
>  };
> @@ -63,6 +69,20 @@
>         bootph-all;
>  };
>  
> +#ifdef CONFIG_FSL_CAAM
> +&sec_jr0 {
> +       bootph-pre-ram;
> +};
> +
> +&sec_jr1 {
> +       bootph-pre-ram;
> +};
> +
> +&sec_jr2 {
> +       bootph-pre-ram;
> +};
> +#endif
> +
>  &spba1 {
>         bootph-pre-ram;
>  };
> diff --git a/arch/arm/dts/imx8mp-beacon-kit-u-boot.dtsi b/arch/arm/dts/imx8mp-beacon-kit-u-boot.dtsi
> index c69f7c9c32c0..393fd8ec2e5b 100644
> --- a/arch/arm/dts/imx8mp-beacon-kit-u-boot.dtsi
> +++ b/arch/arm/dts/imx8mp-beacon-kit-u-boot.dtsi
> @@ -21,10 +21,6 @@
>         bootph-pre-ram;
>  };
>  
> -&crypto {
> -       bootph-pre-ram;
> -};
> -
>  &eqos {
>         /delete-property/ assigned-clocks;
>         /delete-property/ assigned-clock-parents;
> @@ -131,18 +127,6 @@
>         u-boot,off-on-delay-us = <20000>;
>  };
>  
> -&sec_jr0 {
> -       bootph-pre-ram;
> -};
> -
> -&sec_jr1 {
> -       bootph-pre-ram;
> -};
> -
> -&sec_jr2 {
> -       bootph-pre-ram;
> -};
> -
>  &tpm {
>         compatible = "tcg,tpm_tis-spi";
>  };
> diff --git a/arch/arm/dts/imx8mp-evk-u-boot.dtsi b/arch/arm/dts/imx8mp-evk-u-boot.dtsi
> index 17965c58ba10..6d9b229989ac 100644
> --- a/arch/arm/dts/imx8mp-evk-u-boot.dtsi
> +++ b/arch/arm/dts/imx8mp-evk-u-boot.dtsi
> @@ -65,22 +65,6 @@
>         bootph-pre-ram;
>  };
>  
> -&crypto {
> -       bootph-pre-ram;
> -};
> -
> -&sec_jr0 {
> -       bootph-pre-ram;
> -};
> -
> -&sec_jr1 {
> -       bootph-pre-ram;
> -};
> -
> -&sec_jr2 {
> -       bootph-pre-ram;
> -};
> -
>  &i2c1 {
>         bootph-pre-ram;
>  };
> diff --git a/arch/arm/dts/imx8mp-icore-mx8mp-edimm2.2-u-boot.dtsi b/arch/arm/dts/imx8mp-icore-mx8mp-edimm2.2-
> u-boot.dtsi
> index fe20938af536..cf2a87a9b903 100644
> --- a/arch/arm/dts/imx8mp-icore-mx8mp-edimm2.2-u-boot.dtsi
> +++ b/arch/arm/dts/imx8mp-icore-mx8mp-edimm2.2-u-boot.dtsi
> @@ -62,22 +62,6 @@
>         bootph-pre-ram;
>  };
>  
> -&crypto {
> -       bootph-pre-ram;
> -};
> -
> -&sec_jr0 {
> -       bootph-pre-ram;
> -};
> -
> -&sec_jr1 {
> -       bootph-pre-ram;
> -};
> -
> -&sec_jr2 {
> -       bootph-pre-ram;
> -};
> -
>  &i2c1 {
>         bootph-pre-ram;
>  };
> diff --git a/arch/arm/dts/imx8mp-u-boot.dtsi b/arch/arm/dts/imx8mp-u-boot.dtsi
> index b2f213e3e706..afaf64ee9cd8 100644
> --- a/arch/arm/dts/imx8mp-u-boot.dtsi
> +++ b/arch/arm/dts/imx8mp-u-boot.dtsi
> @@ -19,6 +19,12 @@
>  #endif
>  };
>  
> +#ifdef CONFIG_FSL_CAAM
> +&crypto {
> +       bootph-pre-ram;
> +};
> +#endif
> +
>  &soc {
>         bootph-all;
>         bootph-pre-ram;
> @@ -62,6 +68,20 @@
>         bootph-pre-ram;
>  };
>  
> +#ifdef CONFIG_FSL_CAAM
> +&sec_jr0 {
> +       bootph-pre-ram;
> +};
> +
> +&sec_jr1 {
> +       bootph-pre-ram;
> +};
> +
> +&sec_jr2 {
> +       bootph-pre-ram;
> +};
> +#endif
> +
>  &binman {
>          u-boot-spl-ddr {
>                 filename = "u-boot-spl-ddr.bin";
> diff --git a/arch/arm/dts/imx8mp-verdin-wifi-dev-u-boot.dtsi b/arch/arm/dts/imx8mp-verdin-wifi-dev-u-
> boot.dtsi
> index fc87d3f4035b..2a1aa1935a76 100644
> --- a/arch/arm/dts/imx8mp-verdin-wifi-dev-u-boot.dtsi
> +++ b/arch/arm/dts/imx8mp-verdin-wifi-dev-u-boot.dtsi
> @@ -28,10 +28,6 @@
>  
>  };
>  
> -&crypto {
> -       bootph-pre-ram;
> -};
> -
>  &gpio1 {
>         bootph-pre-ram;
>  };
> @@ -140,18 +136,6 @@
>         bootph-pre-ram;
>  };
>  
> -&sec_jr0 {
> -       bootph-pre-ram;
> -};
> -
> -&sec_jr1 {
> -       bootph-pre-ram;
> -};
> -
> -&sec_jr2 {
> -       bootph-pre-ram;
> -};
> -
>  &uart3 {
>         bootph-pre-ram;
>  };

Cheers

Marcel