MLK-18036-1 Add "fsl,optee-lpm-sram" node for optee os power management.

This node will be used by the OCRAM driver in optee to:
* Get the OCRAM start address for power management in optee.
* Add an entry that will overwrite ocrams nodes and dynamically reduce
the OCRAM available for mmio-sram in Linux.

That way we do not touch the legacy Linux boot and remove the dedicated
optee device tree.

Signed-off-by: Clement Faure <clement.faure@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
[Arul: Fix merge conflicts]
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

diff --git a/arch/arm/boot/dts/imx6dl.dtsi b/arch/arm/boot/dts/imx6dl.dtsi
index 96a1558..601b8a3 100755 (executable)
--- a/arch/arm/boot/dts/imx6dl.dtsi
+++ b/arch/arm/boot/dts/imx6dl.dtsi
@@ -91,6 +91,12 @@
                        clocks = <&clks IMX6QDL_CLK_OCRAM>;
                };
 
+               ocram_optee: sram@918000 {
+                       compatible = "fsl,optee-lpm-sram";
+                       reg = <0x918000 0x8000>;
+                       overw_reg = <&ocram 0x905000 0x13000>;
+               };
+
                gpu: gpu@00130000 {
                        compatible = "fsl,imx6dl-gpu", "fsl,imx6q-gpu";
                        reg = <0x00130000 0x4000>, <0x00134000 0x4000>,

diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi
index 0185ffc..759b972 100644 (file)
--- a/arch/arm/boot/dts/imx6q.dtsi
+++ b/arch/arm/boot/dts/imx6q.dtsi
@@ -181,6 +181,12 @@
                        clocks = <&clks IMX6QDL_CLK_OCRAM>;
                };
 
+               ocram_optee: sram@00938000 {
+                       compatible = "fsl,optee-lpm-sram";
+                       reg = <0x00938000 0x8000>;
+                       overw_reg = <&ocram 0x00905000 0x33000>;
+               };
+
                bus@2000000 { /* AIPS1 */
                        spba-bus@2000000 {
                                ecspi5: spi@2018000 {

diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index 822b31c..3749c43 100644 (file)
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -208,6 +208,15 @@
                        clocks = <&clks IMX6SX_CLK_OCRAM>;
                };
 
+               ocram_optee {
+                       compatible = "fsl,optee-lpm-sram";
+                       reg = <0x8f8000 0x4000>;
+                       overw_reg = <&ocrams_ddr 0x904000 0x1000>,
+                                       <&ocram 0x905000 0x1b000>,
+                                       <&ocrams 0x900000 0x4000>;
+                       overw_clock = <&ocrams &clks IMX6SX_CLK_OCRAM>;
+               };
+
                intc: interrupt-controller@a01000 {
                        compatible = "arm,cortex-a9-gic";
                        #interrupt-cells = <3>;

diff --git a/arch/arm/boot/dts/imx7d.dtsi b/arch/arm/boot/dts/imx7d.dtsi
index 2e90215..192b9c9 100644 (file)
--- a/arch/arm/boot/dts/imx7d.dtsi
+++ b/arch/arm/boot/dts/imx7d.dtsi
@@ -107,6 +107,15 @@
                        status = "disabled";
                };
 
+               ocram_optee {
+                       compatible = "fsl,optee-lpm-sram";
+                       reg = <0x180000 0x8000>;
+                       overw_reg = <&ocrams_ddr 0x904000 0x1000>,
+                                       <&ocram 0x905000 0x1b000>,
+                                       <&ocrams 0x900000 0x4000>;
+                       overw_clock = <&ocrams &clks IMX7D_OCRAM_CLK>;
+               };
+
                ocrams_mf: sram-mf@00900000 {
                        compatible = "fsl,mega-fast-sram";
                        reg = <0x00900000 0x20000>;