summaryrefslogtreecommitdiff
authorXindong Xu <xindong.xu@amlogic.com>2018-04-28 02:28:19 (GMT)
committer Gerrit Code Review <gituser@droid04>2018-04-28 02:28:19 (GMT)
commitfd41b7978fe919dd3fc655e187fcdb59b7da95a1 (patch)
tree9f2697f15dfd0b79de565c8c5dabc374240efe11
parentaaeae3bf137296e361883fb9318243d4087cff35 (diff)
parent546f1d6eb11bee550de9024fe7f2eb2d01803b6e (diff)
downloadcommon-fd41b7978fe919dd3fc655e187fcdb59b7da95a1.zip
common-fd41b7978fe919dd3fc655e187fcdb59b7da95a1.tar.gz
common-fd41b7978fe919dd3fc655e187fcdb59b7da95a1.tar.bz2
Merge "dts: enable pstore to fix CtsLiblogTestCases [1/1]" into ampere-20180311
Diffstat
-rw-r--r--arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts8
-rw-r--r--arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts8
2 files changed, 16 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts b/arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts
index 5dc7a2e2..fef84d5 100644
--- a/arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts
@@ -50,6 +50,14 @@
#size-cells = <2>;
ranges;
/* global autoconfigured region for contiguous allocations */
+ ramoops@0x07400000 {
+ compatible = "ramoops";
+ reg = <0x0 0x07400000 0x0 0x00100000>;
+ record-size = <0x8000>;
+ console-size = <0x8000>;
+ ftrace-size = <0x0>;
+ pmsg-size = <0x8000>;
+ };
secmon_reserved:linux,secmon {
compatible = "shared-dma-pool";
reusable;
diff --git a/arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts b/arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts
index 09efec4..b38caf0 100644
--- a/arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts
@@ -50,6 +50,14 @@
#size-cells = <2>;
ranges;
/* global autoconfigured region for contiguous allocations */
+ ramoops@0x07400000 {
+ compatible = "ramoops";
+ reg = <0x0 0x07400000 0x0 0x00100000>;
+ record-size = <0x8000>;
+ console-size = <0x8000>;
+ ftrace-size = <0x0>;
+ pmsg-size = <0x8000>;
+ };
secmon_reserved:linux,secmon {
compatible = "shared-dma-pool";
reusable;