diff options
| author | Dan Douglass <dan.douglass@freescale.com> | 2016-01-28 14:48:52 -0600 |
|---|---|---|
| committer | Jason Liu <jason.hui.liu@nxp.com> | 2019-02-12 10:24:20 +0800 |
| commit | adaeb80c5f0405126e9896758f169a9e4fb27a54 (patch) | |
| tree | 1b9f7d16f77e59c766b2c9978d99948810ec0f74 /arch/arm/boot/dts/imx6sx.dtsi | |
| parent | 61d27d537d46259cbb11946af217c9b53e7d0915 (diff) | |
MLK-12339 Security: Missing caam support.
Added CAAM to the device tree for imx6sx in imx6sx.dtsi.
Signed-off-by: Dan Douglass <dan.douglass@nxp.com>
Diffstat (limited to 'arch/arm/boot/dts/imx6sx.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx6sx.dtsi | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi index 3205c63ce32a..4b79f19acbbc 100644 --- a/arch/arm/boot/dts/imx6sx.dtsi +++ b/arch/arm/boot/dts/imx6sx.dtsi @@ -236,6 +236,17 @@ clocks = <&clks IMX6SX_CLK_APBH_DMA>; }; + caam_sm: caam-sm@00100000 { + compatible = "fsl,imx6q-caam-sm"; + reg = <0x00100000 0x3fff>; + }; + + irq_sec_vio: caam_secvio { + compatible = "fsl,imx6q-caam-secvio"; + interrupts = <0 20 0x04>; + secvio_src = <0x8000001d>; + }; + gpmi: gpmi-nand@01806000{ compatible = "fsl,imx6sx-gpmi-nand"; #address-cells = <1>; @@ -769,6 +780,11 @@ fsl,anatop = <&anatop>; }; + caam_snvs: caam-snvs@020cc000 { + compatible = "fsl,imx6q-caam-snvs"; + reg = <0x020cc000 0x4000>; + }; + snvs: snvs@020cc000 { compatible = "fsl,sec-v4.0-mon", "syscon", "simple-mfd"; reg = <0x020cc000 0x4000>; @@ -895,8 +911,8 @@ fsl,sec-era = <4>; #address-cells = <1>; #size-cells = <1>; - reg = <0x2100000 0x10000>; - ranges = <0 0x2100000 0x10000>; + reg = <0x2100000 0x40000>; + ranges = <0 0x2100000 0x40000>; interrupt-parent = <&intc>; clocks = <&clks IMX6SX_CLK_CAAM_MEM>, <&clks IMX6SX_CLK_CAAM_ACLK>, @@ -907,13 +923,15 @@ sec_jr0: jr0@1000 { compatible = "fsl,sec-v4.0-job-ring"; reg = <0x1000 0x1000>; - interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>; + interrupt-parent = <&intc>; + interrupts = <0 105 0x4>; }; sec_jr1: jr1@2000 { compatible = "fsl,sec-v4.0-job-ring"; reg = <0x2000 0x1000>; - interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>; + interrupt-parent = <&intc>; + interrupts = <0 106 0x4>; }; }; |