arm: dts: imx8m: move CAAM nodes into common u-boot.dtsi

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@gateworks.com>
Reviewed-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>

diff --git a/arch/arm/dts/imx8mm-evk-u-boot.dtsi b/arch/arm/dts/imx8mm-evk-u-boot.dtsi
index 155670d..9a5b079 100644 (file)
--- 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 1ad9d49..ae542fd 100644 (file)
--- 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 f7eb29c..06f2f73 100644 (file)
--- 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 315714f..c31f3de 100644 (file)
--- 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 5e07055..96b1a1b 100644 (file)
--- 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 c69f7c9..393fd8e 100644 (file)
--- 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 17965c5..6d9b229 100644 (file)
--- 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 fe20938..cf2a87a 100644 (file)
--- 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 694dea1..4b1a916 100644 (file)
--- 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 fc87d3f..2a1aa19 100644 (file)
--- 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;
 };