MLK-16959: crypto: caam Add CAAM page 0 definition in device tree

Add definition of CAAM page 0 in the device tree.
This page is only accessible by the CPU in secure world.
this is defined by the secure-status.

Signed-off-by: Cedric Neveux <cedric.neveux@nxp.com>

diff --git a/Documentation/devicetree/bindings/crypto/fsl-sec4.txt b/Documentation/devicetree/bindings/crypto/fsl-sec4.txt
index 2a3aee9..01294c0 100644 (file)
--- a/Documentation/devicetree/bindings/crypto/fsl-sec4.txt
+++ b/Documentation/devicetree/bindings/crypto/fsl-sec4.txt
@@ -147,6 +147,49 @@ EXAMPLE
                clock-names = "mem", "aclk", "ipg", "emi_slow";
        };
 
+=====================================================================
+SEC 4 Page 0
+
+Description
+
+    Most of CAAM's configuration registers are accessible in block0
+    of CAAM's register space. These registers are intended to be
+    accessed by specially privileged software (e.g. boot software,
+    hypervisor, secure operating system).
+
+PROPERTIES
+
+   - compatible
+      Usage: required
+      Value type: <string>
+      Definition: Must include "fsl,sec-v4.0-ctrl".
+
+   - reg
+      Usage: required
+      Value type: <prop-encoded-array>
+      Definition: A standard property.  Specifies the physical
+          address and length of the SEC4 configuration registers.
+
+   - secure-status
+      Usage: required
+      Value type: <string>
+      Definition: Must include "okay".
+
+   - status
+      Usage: required
+      Value type: <string>
+      Definition: Must include "disabled".
+
+EXAMPLE
+       sec_ctrl: ctrl@0 {
+               /* CAAM Page 0 only accessible */
+               /*      by secure world */
+               compatible = "fsl,sec-v4.0-ctrl";
+               reg = <0x2100000 0x1000>;
+               secure-status = "okay";
+               status = "disabled";
+       };
+
 =====================================================================
 Job Ring (JR) Node
 

diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index cead55a..8d195ba 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -1025,6 +1025,15 @@
                                         <&clks IMX6QDL_CLK_EIM_SLOW>;
                                clock-names = "mem", "aclk", "ipg", "emi_slow";
 
+                               sec_ctrl: ctrl@0 {
+                                       /* CAAM Page 0 only accessible */
+                                       /*      by secure world */
+                                       compatible = "fsl,sec-v4.0-ctrl";
+                                       reg = <0x2100000 0x1000>;
+                                       secure-status = "okay";
+                                       status = "disabled";
+                               };
+
                                sec_jr0: jr0@1000 {
                                        compatible = "fsl,sec-v4.0-job-ring";
                                        reg = <0x1000 0x1000>;

diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index 7359c20..ddb2bc6 100644 (file)
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -939,6 +939,15 @@
                                         <&clks IMX6SX_CLK_EIM_SLOW>;
                                clock-names = "mem", "aclk", "ipg", "emi_slow";
 
+                               sec_ctrl: ctrl@0 {
+                                       /* CAAM Page 0 only accessible */
+                                       /*      by secure world */
+                                       compatible = "fsl,sec-v4.0-ctrl";
+                                       reg = <0x2100000 0x1000>;
+                                       secure-status = "okay";
+                                       status = "disabled";
+                               };
+
                                sec_jr0: jr0@1000 {
                                        compatible = "fsl,sec-v4.0-job-ring";
                                        reg = <0x1000 0x1000>;

diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
index 0b04e4e..41c30d5 100644 (file)
--- a/arch/arm/boot/dts/imx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul.dtsi
@@ -888,6 +888,15 @@
                                         <&clks IMX6UL_CLK_CAAM_MEM>;
                                clock-names = "ipg", "aclk", "mem";
 
+                               sec_ctrl: ctrl@0 {
+                                       /* CAAM Page 0 only accessible */
+                                       /*      by secure world */
+                                       compatible = "fsl,sec-v4.0-ctrl";
+                                       reg = <0x2140000 0x1000>;
+                                       secure-status = "okay";
+                                       status = "disabled";
+                               };
+
                                sec_jr0: jr0@1000 {
                                        compatible = "fsl,sec-v4.0-job-ring";
                                        reg = <0x1000 0x1000>;

diff --git a/arch/arm/boot/dts/imx7d.dtsi b/arch/arm/boot/dts/imx7d.dtsi
index 9203b70..95b0891 100644 (file)
--- a/arch/arm/boot/dts/imx7d.dtsi
+++ b/arch/arm/boot/dts/imx7d.dtsi
@@ -415,6 +415,16 @@
                clocks = <&clks IMX7D_CAAM_CLK>,
                        <&clks IMX7D_AHB_CHANNEL_ROOT_CLK>;
                clock-names = "ipg", "aclk";
+
+               sec_ctrl: ctrl@0 {
+                       /* CAAM Page 0 only accessible */
+                       /*      by secure world */
+                       compatible = "fsl,sec-v4.0-ctrl";
+                       reg = <0x30900000 0x1000>;
+                       secure-status = "okay";
+                       status = "disabled";
+               };
+
                sec_jr0: jr0@1000 {
                         compatible = "fsl,sec-v4.0-job-ring";
                         reg = <0x1000 0x1000>;