summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSanchayan Maity <maitysanchayan@gmail.com>2016-09-23 18:09:08 +0530
committerStefan Agner <stefan.agner@toradex.com>2016-09-29 13:58:08 -0700
commit80c40b6ad1f4605ee897f94323a6441a5b2a2cf5 (patch)
tree46f1a3695b9e49bbff3917c309a1ea5b2aa68185
parentcd89f007101ad44dc318b2aca826b5754c5ccfa9 (diff)
ARM: dts: vfxxx: Reintroduce the OCRAM nodes
The OCRAM nodes were removed due to resource conflict between the power management code and remoteproc. This broke suspend resume. Reintroduce the OCRAM nodes for suspend resume to work again. With that the power management code is able to allocate the SRAM resources at startup. If remoteproc is going to be used, the SRAM driver can be disabled using initcall_blacklist=sram_init. Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com> Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
-rw-r--r--arch/arm/boot/dts/vfxxx.dtsi26
1 files changed, 26 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/vfxxx.dtsi b/arch/arm/boot/dts/vfxxx.dtsi
index 6f9e278d1830..3cacaaa38749 100644
--- a/arch/arm/boot/dts/vfxxx.dtsi
+++ b/arch/arm/boot/dts/vfxxx.dtsi
@@ -69,6 +69,32 @@
reg = <0x00000000 0x18000>;
};
+ ocram0: sram@3f000000 {
+ compatible = "mmio-sram";
+ reg = <0x3f000000 0x40000>;
+
+ #address-cells = <1>;
+ #size-cells = <1>;
+ ranges = <0 0x3f000000 0x40000>;
+
+ stbyram1@0 {
+ reg = <0x0 0x4000>;
+ label = "stbyram1";
+ pool;
+ };
+
+ stbyram2@4000 {
+ reg = <0x4000 0xc000>;
+ label = "stbyram2";
+ pool;
+ };
+ };
+
+ ocram1: sram@3f040000 {
+ compatible = "mmio-sram";
+ reg = <0x3f040000 0x40000>;
+ };
+
gfxram0: sram@3f400000 {
compatible = "mmio-sram";
reg = <0x3f400000 0x80000>;