MLK-18036-2 Delete *optee.dts files

A specific node for OCRAM mapping in optee as been added in
the device tree. These dedicated optee device trees can be
removed.

Signed-off-by: Clement Faure <clement.faure@nxp.com>
Acked-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit a6fd1613cca4a5008c347d4473b92b119385644c)

diff --git a/arch/arm/boot/dts/imx6dl-sabreauto-optee.dts b/arch/arm/boot/dts/imx6dl-sabreauto-optee.dts
deleted file mode 100644 (file)
index 2362784..0000000
--- a/arch/arm/boot/dts/imx6dl-sabreauto-optee.dts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * 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 "imx6dl-sabreauto.dts"
-
-&ocram {
-       reg = <0x00905000 0x13000>;
-};

diff --git a/arch/arm/boot/dts/imx6dl-sabresd-optee.dts b/arch/arm/boot/dts/imx6dl-sabresd-optee.dts
deleted file mode 100644 (file)
index 7b5af9a..0000000
--- a/arch/arm/boot/dts/imx6dl-sabresd-optee.dts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * 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 "imx6dl-sabresd.dts"
-
-&ocram {
-       reg = <0x00905000 0x13000>;
-};

diff --git a/arch/arm/boot/dts/imx6q-sabreauto-optee.dts b/arch/arm/boot/dts/imx6q-sabreauto-optee.dts
deleted file mode 100644 (file)
index 6b684bd..0000000
--- a/arch/arm/boot/dts/imx6q-sabreauto-optee.dts
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * 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 "imx6q-sabreauto.dts"
-
-&ocram {
-       /* Reserve the high 32K for OP-TEE */
-       reg = <0x00905000 0x33000>;
-};

diff --git a/arch/arm/boot/dts/imx6q-sabresd-optee.dts b/arch/arm/boot/dts/imx6q-sabresd-optee.dts
deleted file mode 100644 (file)
index 1fa1094..0000000
--- a/arch/arm/boot/dts/imx6q-sabresd-optee.dts
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * 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 "imx6q-sabresd.dts"
-
-&ocram {
-       /* Reserve the high 32K for OP-TEE */
-       reg = <0x00905000 0x33000>;
-};

diff --git a/arch/arm/boot/dts/imx6qp-sabreauto-optee.dts b/arch/arm/boot/dts/imx6qp-sabreauto-optee.dts
deleted file mode 100644 (file)
index 1d9cdcd..0000000
--- a/arch/arm/boot/dts/imx6qp-sabreauto-optee.dts
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * 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 "imx6qp-sabreauto.dts"
-
-/* TODO: This needs to be changed to use OCRAM3 */
-&ocram {
-       reg = <0x00905000 0x33000>;
-};

diff --git a/arch/arm/boot/dts/imx6qp-sabresd-optee.dts b/arch/arm/boot/dts/imx6qp-sabresd-optee.dts
deleted file mode 100644 (file)
index 8a036e9..0000000
--- a/arch/arm/boot/dts/imx6qp-sabresd-optee.dts
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * 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 "imx6qp-sabresd.dts"
-
-/* TODO: This needs to be changed to use OCRAM3 */
-&ocram {
-       reg = <0x00905000 0x33000>;
-};

diff --git a/arch/arm/boot/dts/imx6sl-evk-optee.dts b/arch/arm/boot/dts/imx6sl-evk-optee.dts
deleted file mode 100644 (file)
index 10a57b8..0000000
--- a/arch/arm/boot/dts/imx6sl-evk-optee.dts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * 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
deleted file mode 100644 (file)
index c71a89b..0000000
--- a/arch/arm/boot/dts/imx6sll-evk-optee.dts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * 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>;
-};

diff --git a/arch/arm/boot/dts/imx6sx-sabreauto-optee.dts b/arch/arm/boot/dts/imx6sx-sabreauto-optee.dts
deleted file mode 100644 (file)
index a84a09e..0000000
--- a/arch/arm/boot/dts/imx6sx-sabreauto-optee.dts
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * 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 "imx6sx-sabreauto.dts"
-
-&ocram {
-       reg = <0x00905000 0x1b000>;
-};
-
-&ocrams_ddr {
-       reg = <0x00904000 0x1000>;
-};
-
-&ocrams {
-       /* 0x8f8000 are used by optee */
-       reg = <0x00900000 0x4000>;
-       clocks = <&clks IMX6SX_CLK_OCRAM>;
-};

diff --git a/arch/arm/boot/dts/imx6sx-sdb-optee.dts b/arch/arm/boot/dts/imx6sx-sdb-optee.dts
deleted file mode 100644 (file)
index 8c247cf..0000000
--- a/arch/arm/boot/dts/imx6sx-sdb-optee.dts
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * 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 "imx6sx-sdb.dts"
-
-&ocram {
-       reg = <0x00905000 0x1b000>;
-};
-
-&ocrams_ddr {
-       reg = <0x00904000 0x1000>;
-};
-
-&ocrams {
-       /* 0x8f8000 are used by optee */
-       reg = <0x00900000 0x4000>;
-       clocks = <&clks IMX6SX_CLK_OCRAM>;
-};

diff --git a/arch/arm/boot/dts/imx6ul-14x14-evk-optee.dts b/arch/arm/boot/dts/imx6ul-14x14-evk-optee.dts
deleted file mode 100644 (file)
index a764769..0000000
--- a/arch/arm/boot/dts/imx6ul-14x14-evk-optee.dts
+++ /dev/null
@@ -1,14 +0,0 @@
-
-/*
- * 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 "imx6ul-14x14-evk.dts"
-
-&ocram {
-       reg = <0x00905000 0x13000>;
-};

diff --git a/arch/arm/boot/dts/imx6ul-9x9-evk-optee.dts b/arch/arm/boot/dts/imx6ul-9x9-evk-optee.dts
deleted file mode 100644 (file)
index cfde6b1..0000000
--- a/arch/arm/boot/dts/imx6ul-9x9-evk-optee.dts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * 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 "imx6ul-9x9-evk.dts"
-
-&ocram {
-       reg = <0x00905000 0x13000>;
-};

diff --git a/arch/arm/boot/dts/imx6ull-14x14-evk-optee.dts b/arch/arm/boot/dts/imx6ull-14x14-evk-optee.dts
deleted file mode 100644 (file)
index 4027c54..0000000
--- a/arch/arm/boot/dts/imx6ull-14x14-evk-optee.dts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * 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 "imx6ull-14x14-evk.dts"
-
-&ocram {
-       reg = <0x00905000 0x13000>;
-};

diff --git a/arch/arm/boot/dts/imx7d-sdb-optee.dts b/arch/arm/boot/dts/imx7d-sdb-optee.dts
deleted file mode 100644 (file)
index 9302a2c..0000000
--- a/arch/arm/boot/dts/imx7d-sdb-optee.dts
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * 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 "imx7d-sdb.dts"
-
-&ocram {
-       reg = <0x00905000 0x1b000>;
-};
-
-&ocrams_ddr {
-       reg = <0x00904000 0x1000>;
-};
-
-&ocrams {
-       /* 0x180000 are used by optee */
-       reg = <0x00900000 0x4000>;
-       clocks = <&clks IMX7D_OCRAM_CLK>;
-};