[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-451-ga5b20826e

[Sébastien S. <ss...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  a5b20826e991f4409c3b5f4c8997a4deec61ed3d (commit)
      from  156362d702c46bbf2b71d7f3df0dc7f3b898b934 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a5b20826e991f4409c3b5f4c8997a4deec61ed3d
Author: Sébastien Szymanski <seb...@ar...>
Date:   Tue Jul 17 15:07:37 2018 +0200

    [LINUX] 4.17: opos6ul: add CAAM support (i.MX6UL only)

-----------------------------------------------------------------------

Summary of changes:
 .../0106-ARM-dts-imx6ul-Add-CAAM-support.patch     | 75 ++++++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 patches/linux/4.17/0106-ARM-dts-imx6ul-Add-CAAM-support.patch

diff --git a/patches/linux/4.17/0106-ARM-dts-imx6ul-Add-CAAM-support.patch b/patches/linux/4.17/0106-ARM-dts-imx6ul-Add-CAAM-support.patch
new file mode 100644
index 000000000..12e02ac5a
--- /dev/null
+++ b/patches/linux/4.17/0106-ARM-dts-imx6ul-Add-CAAM-support.patch
@@ -0,0 +1,75 @@
+From 8c371730a70504dc84a065a97757386ccc06ec80 Mon Sep 17 00:00:00 2001
+From: Fabio Estevam <fab...@nx...>
+Date: Sat, 14 Apr 2018 17:55:30 -0300
+Subject: [PATCH] ARM: dts: imx6ul: Add CAAM support
+
+Add CAAM support on i.MX6UL.
+
+Also, since CAAM is not available on i.MX6ULL the CAAM node
+needs to be deleted in the imx6ull.dtsi.
+
+Signed-off-by: Fabio Estevam <fab...@nx...>
+Reviewed-by: Stefan Agner <st...@ag...>
+Signed-off-by: Shawn Guo <sha...@ke...>
+---
+ arch/arm/boot/dts/imx6ul.dtsi  | 30 ++++++++++++++++++++++++++++++
+ arch/arm/boot/dts/imx6ull.dtsi |  2 ++
+ 2 files changed, 32 insertions(+)
+
+diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
+index 1241972b16ba..2b854d1d9f20 100644
+--- a/arch/arm/boot/dts/imx6ul.dtsi
++++ b/arch/arm/boot/dts/imx6ul.dtsi
+@@ -769,6 +769,36 @@
+ 			reg = <0x02100000 0x100000>;
+ 			ranges;
+ 
++			crypto: caam@2140000 {
++				compatible = "fsl,imx6ul-caam", "fsl,sec-v4.0";
++				#address-cells = <1>;
++				#size-cells = <1>;
++				reg = <0x2140000 0x3c000>;
++				ranges = <0 0x2140000 0x3c000>;
++				interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;
++				clocks = <&clks IMX6UL_CLK_CAAM_IPG>, <&clks IMX6UL_CLK_CAAM_ACLK>,
++					 <&clks IMX6UL_CLK_CAAM_MEM>;
++				clock-names = "ipg", "aclk", "mem";
++
++				sec_jr0: jr0@1000 {
++					compatible = "fsl,sec-v4.0-job-ring";
++					reg = <0x1000 0x1000>;
++					interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
++				};
++
++				sec_jr1: jr1@2000 {
++					compatible = "fsl,sec-v4.0-job-ring";
++					reg = <0x2000 0x1000>;
++					interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
++				};
++
++				sec_jr2: jr2@3000 {
++					compatible = "fsl,sec-v4.0-job-ring";
++					reg = <0x3000 0x1000>;
++					interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;
++				};
++			};
++
+ 			usbotg1: usb@2184000 {
+ 				compatible = "fsl,imx6ul-usb", "fsl,imx27-usb";
+ 				reg = <0x02184000 0x200>;
+diff --git a/arch/arm/boot/dts/imx6ull.dtsi b/arch/arm/boot/dts/imx6ull.dtsi
+index 571ddd71cdba..ebc25c98e5e1 100644
+--- a/arch/arm/boot/dts/imx6ull.dtsi
++++ b/arch/arm/boot/dts/imx6ull.dtsi
+@@ -45,6 +45,8 @@
+ 
+ /* Delete UART8 in AIPS-1 (i.MX6UL specific) */
+ /delete-node/ &uart8;
++/* Delete CAAM node in AIPS-2 (i.MX6UL specific) */
++/delete-node/ &crypto;
+ 
+ / {
+ 	soc {
+-- 
+2.16.4
+


hooks/post-receive
-- 
armadeus