iMX/i2som-imx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MLK-18082: ARM: dts: imx: Change size of caam-sm to correct size

Browse Source 
The resources retrieved by CAAM driver was wrong as the size
was not correct hence future uses might have issues.

before:
[    3.010744] caam 30900000.caam:
sm res: [start: 0000000000100000,
	end: 0000000000107ffe,
	name: /caam-sm@00100000,
	flags:0x200 desc:0x0] -> size: 0x7fff

modif to actual size:
[    3.012495] caam 30900000.caam:
sm res: [start: 0000000000100000,
	end: 0000000000107fff,
	name: /caam-sm@00100000,
	flags:0x200 desc:0x0] -> size: 0x8000

Signed-off-by: Franck LENORMAND <franck.lenormand@nxp.com>
[Arul: Fix merge conflicts, ignored arm64 changes]
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>
This commit is contained in:
Franck LENORMAND
2018-07-19 11:35:35 +02:00
committed by Leonard Crestez
parent a0fef0e8bc
commit 42993884b1
6 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Documentation/devicetree/bindings/crypto/fsl-sec4.txt
View File

@ -244,6 +244,25 @@ EXAMPLE
interrupts = <88 2>;
};
=====================================================================
Secure memory (SM) Node
- compatible
Usage: required
Value type: <string>
Definition: Must include "fsl,imx6q-caam-sm"
- reg
Usage: required
Value type: <prop-encoded-array>
Definition: Specifies a two SM parameters: an offset from
the parent physical address and the length the SM registers.
EXAMPLE
caam_sm: caam-sm@00100000 {
compatible = "fsl,imx6q-caam-sm";
reg = <0x00100000 0x4000>;
};
=====================================================================
Run Time Integrity Check (RTIC) Node

5
arch/arm/boot/dts/imx6qdl.dtsi
View File

@ -146,6 +146,11 @@
interrupt-parent = <&gpc>;
ranges;
caam_sm: caam-sm@100000 {
compatible = "fsl,imx6q-caam-sm";
reg = <0x00100000 0x4000>;
};
dma_apbh: dma-apbh@110000 {
compatible = "fsl,imx6q-dma-apbh", "fsl,imx28-dma-apbh";
reg = <0x00110000 0x2000>;

2
arch/arm/boot/dts/imx6sx.dtsi
View File

@ -283,7 +283,7 @@
caam_sm: caam-sm@00100000 {
compatible = "fsl,imx6q-caam-sm";
reg = <0x00100000 0x7fff>;
reg = <0x00100000 0x8000>;
};
irq_sec_vio: caam_secvio {

2
arch/arm/boot/dts/imx6ul.dtsi
View File

@ -226,7 +226,7 @@
caam_sm: caam-sm@00100000 {
compatible = "fsl,imx7d-caam-sm", "fsl,imx6q-caam-sm";
reg = <0x00100000 0x7fff>;
reg = <0x00100000 0x8000>;
};
irq_sec_vio: caam_secvio {

2
arch/arm/boot/dts/imx7d.dtsi
View File

@ -108,7 +108,7 @@
caam_sm: caam-sm@00100000 {
compatible = "fsl,imx7d-caam-sm", "fsl,imx6q-caam-sm";
reg = <0x00100000 0x7fff>;
reg = <0x00100000 0x8000>;
};
irq_sec_vio: caam_secvio {

5
arch/arm/boot/dts/imx7ulp.dtsi
View File

@ -146,6 +146,11 @@
compatible = "arm,cortex-a7-pmu";
};
caam_sm: caam-sm@26000000 {
compatible = "fsl,imx6q-caam-sm";
reg = <0x26000000 0x8000>;
};
ahbbridge0: ahb-bridge0@40000000 {
compatible = "fsl,aips-bus", "simple-bus";
#address-cells = <1>;