diff options
| author | Horia Geantă <horia.geanta@nxp.com> | 2019-09-29 12:45:20 +0300 |
|---|---|---|
| committer | Dong Aisheng <aisheng.dong@nxp.com> | 2019-11-25 16:08:18 +0800 |
| commit | c685791ca6dc2db7b5bac3c320e38bdae48965ba (patch) | |
| tree | 1602606ceed175dc9aed9a85e440c8b8e5001e2e /arch/arm/boot/dts/imx7s.dtsi | |
| parent | bd7968b6f1b5cab4c339c8a94c7047748f12af7e (diff) | |
MLKU-25-2 ARM: dts: imx: add secure memory
This is a rework of the following i.MX BSP commits
(rel_imx_4.19.35_1.1.0_rc2):
e16519004971 ("MLK-12339 Security: Missing caam support.")
dfc914b909cd ("ARM: dts: imx6ul: Add caam")
9d9ca7a03e3b ("MLK-11922 i.mx6: Linux 3.14.28 CAAM & SNVS enabled by default. JTAG, DS-5 attachment causes exceptions")
42993884b16f ("MLK-18082: ARM: dts: imx: Change size of caam-sm to correct size")
Signed-off-by: Dan Douglass <dan.douglass@nxp.com>
Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
Diffstat (limited to 'arch/arm/boot/dts/imx7s.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx7s.dtsi | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi index 4fd307cc9d04..6e4ee11443ee 100644 --- a/arch/arm/boot/dts/imx7s.dtsi +++ b/arch/arm/boot/dts/imx7s.dtsi @@ -193,6 +193,11 @@ }; }; + caam_sm: caam-sm@100000 { + compatible = "fsl,imx7d-caam-sm", "fsl,imx6q-caam-sm"; + reg = <0x100000 0x8000>; + }; + funnel@30083000 { compatible = "arm,coresight-dynamic-funnel", "arm,primecell"; reg = <0x30083000 0x1000>; |