MLK-17082-02 ARM: dts: imx: Add dedicated dts for optee support on imx6sl/sll

Add dedicated dts file to support optee on imx6sl/sll. The OCRAM is resized
to make sure the OCRAM space used by TEE side is not visiable to no-secure
linux kernel side.

Signed-off-by: Bai Ping <ping.bai@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index e74ddea..35ca227 100644 (file)
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -457,6 +457,7 @@ dtb-$(CONFIG_SOC_IMX6SL) += \
        imx6sl-evk-ldo.dtb \
        imx6sl-evk-csi.dtb \
        imx6sl-evk-uart.dtb \
+       imx6sl-evk-optee.dtb \
        imx6sl-warp.dtb
 dtb-$(CONFIG_SOC_IMX6SX) += \
        imx6sx-nitrogen6sx.dtb \
@@ -553,6 +554,7 @@ dtb-$(CONFIG_SOC_IMX6SLL) += \
        imx6sll-lpddr3-arm2-spdif.dtb \
        imx6sll-evk.dtb \
        imx6sll-evk-reva.dtb \
+       imx6sll-evk-optee.dtb \
        imx6sll-evk-btwifi.dtb
 dtb-$(CONFIG_SOC_IMX7D) += \
        imx7d-cl-som-imx7.dtb \

diff --git a/arch/arm/boot/dts/imx6sl-evk-optee.dts b/arch/arm/boot/dts/imx6sl-evk-optee.dts
new file mode 100644 (file)
index 0000000..10a57b8
--- /dev/null
+++ b/arch/arm/boot/dts/imx6sl-evk-optee.dts
@@ -0,0 +1,13 @@
+/*
+ * Copyright 2017 NXP.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include "imx6sl-evk.dts"
+
+&ocram {
+       reg = <0x00905000 0x13000>;
+};

diff --git a/arch/arm/boot/dts/imx6sll-evk-optee.dts b/arch/arm/boot/dts/imx6sll-evk-optee.dts
new file mode 100644 (file)
index 0000000..c71a89b
--- /dev/null
+++ b/arch/arm/boot/dts/imx6sll-evk-optee.dts
@@ -0,0 +1,13 @@
+/*
+ * Copyright 2017 NXP.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include "imx6sll-evk.dts"
+
+&ocram {
+       reg = <0x00905000 0x13000>;
+};