TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arm64: dts: rockchip: ramoops use DT reserved-memory bindings

Browse Source 
According to commit 529182e204 ("ramoops: use DT reserved-memory bindings")

Change-Id: I73efa992937e6faab5cb2987007d98c8e8294cb0
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
This commit is contained in:
Tao Huang
2019-10-10 11:26:16 +08:00
parent 85f26ab1a9
commit 0067bf6c5b
10 changed files with 68 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm64/boot/dts/rockchip/px30-android.dtsi
+8 -13
View File
@@ -35,20 +35,15 @@
compatible = "rockchip,drm-logo";
reg = <0x0 0x0 0x0 0x0>;
};
};
ramoops_mem: ramoops_mem@110000 {
reg = <0x0 0x110000 0x0 0xf0000>;
reg-names = "ramoops_mem";
};
ramoops {
compatible = "ramoops";
record-size = <0x0 0x20000>;
console-size = <0x0 0x80000>;
ftrace-size = <0x0 0x00000>;
pmsg-size = <0x0 0x50000>;
memory-region = <&ramoops_mem>;
ramoops: ramoops@110000 {
compatible = "ramoops";
reg = <0x0 0x110000 0x0 0xf0000>;
record-size = <0x20000>;
console-size = <0x80000>;
ftrace-size = <0x00000>;
pmsg-size = <0x50000>;
};
};
};
arch/arm64/boot/dts/rockchip/px30-robot.dtsi
+6 -10
View File
@@ -25,22 +25,18 @@
status = "okay";
};
ramoops {
compatible = "ramoops";
record-size = <0x0 0x20000>;
console-size = <0x0 0x80000>;
ftrace-size = <0x0 0x00000>;
pmsg-size = <0x0 0x00000>;
memory-region = <&ramoops_mem>;
};
reserved-memory {
#address-cells = <2>;
#size-cells = <2>;
ranges;
ramoops_mem: ramoops@00000000 {
ramoops: ramoops@8000000 {
compatible = "ramoops";
reg = <0x0 0x8000000 0x0 0xa0000>;
record-size = <0x20000>;
console-size = <0x80000>;
ftrace-size = <0x00000>;
pmsg-size = <0x00000>;
};
};
};
arch/arm64/boot/dts/rockchip/rk1808-evb.dtsi
+6 -10
View File
@@ -117,20 +117,16 @@
reg = <0x0 0x0 0x0 0x0>;
};
ramoops_mem: region@110000 {
ramoops: ramoops@110000 {
compatible = "ramoops";
reg = <0x0 0x110000 0x0 0xf0000>;
record-size = <0x30000>;
console-size = <0xc0000>;
ftrace-size = <0x00000>;
pmsg-size = <0x00000>;
};
};
ramoops: ramoops {
compatible = "ramoops";
record-size = <0x0 0x30000>;
console-size = <0x0 0xc0000>;
ftrace-size = <0x0 0x00000>;
pmsg-size = <0x0 0x00000>;
memory-region = <&ramoops_mem>;
};
rk809_sound: rk809-sound {
status = "disabled";
compatible = "simple-audio-card";
arch/arm64/boot/dts/rockchip/rk3308-voice-module-board-v10.dts
+3 -6
View File
@@ -12,11 +12,8 @@
compatible = "rockchip,rk3308-voice-module-board-v10", "rockchip,rk3308";
};
&ramoops_mem {
reg = <0x0 0x110000 0x0 0xf0000>;
};
&ramoops {
record-size = <0x0 0x30000>;
console-size = <0x0 0xc0000>;
reg = <0x0 0x110000 0x0 0xf0000>;
record-size = <0x30000>;
console-size = <0xc0000>;
};
arch/arm64/boot/dts/rockchip/rk3308.dtsi
+9 -14
View File
@@ -278,20 +278,6 @@
method = "smc";
};
ramoops_mem: ramoops_mem {
reg = <0x0 0x110000 0x0 0xf0000>;
reg-names = "ramoops_mem";
};
ramoops: ramoops {
compatible = "ramoops";
record-size = <0x0 0x30000>;
console-size = <0x0 0xc0000>;
ftrace-size = <0x0 0x00000>;
pmsg-size = <0x0 0x00000>;
memory-region = <&ramoops_mem>;
};
rgb: rgb {
compatible = "rockchip,rk3308-rgb";
status = "disabled";
@@ -326,6 +312,15 @@
compatible = "rockchip,drm-logo";
reg = <0x0 0x0 0x0 0x0>;
};
ramoops: ramoops@110000 {
compatible = "ramoops";
reg = <0x0 0x110000 0x0 0xf0000>;
record-size = <0x30000>;
console-size = <0xc0000>;
ftrace-size = <0x00000>;
pmsg-size = <0x00000>;
};
};
rockchip_suspend: rockchip-suspend {
arch/arm64/boot/dts/rockchip/rk3328-android.dtsi
+9 -13
View File
@@ -35,15 +35,20 @@
reg = <0x0 0x0 0x0 0x0>;
};
ramoops: ramoops@110000 {
compatible = "ramoops";
reg = <0x0 0x110000 0x0 0xf0000>;
record-size = <0x20000>;
console-size = <0x80000>;
ftrace-size = <0x00000>;
pmsg-size = <0x50000>;
};
secure_memory: secure-memory@20000000 {
compatible = "rockchip,secure-memory";
reg = <0x0 0x20000000 0x0 0x0>;
};
ramoops_mem: ramoops@68000000 {
reg = <0x0 0x110000 0x0 0xf0000>;
};
/* global autoconfigured region for contiguous allocations */
linux,cma {
compatible = "shared-dma-pool";
@@ -52,15 +57,6 @@
linux,cma-default;
};
};
ramoops {
compatible = "ramoops";
record-size = <0x0 0x20000>;
console-size = <0x0 0x80000>;
ftrace-size = <0x0 0x00000>;
pmsg-size = <0x0 0x50000>;
memory-region = <&ramoops_mem>;
};
};
&display_subsystem {
arch/arm64/boot/dts/rockchip/rk3368-android.dtsi
+9 -14
View File
@@ -56,20 +56,6 @@
interrupts = <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>; /* signal irq */
};
ramoops_mem: ramoops_mem {
reg = <0x0 0x110000 0x0 0xf0000>;
reg-names = "ramoops_mem";
};
ramoops {
compatible = "ramoops";
record-size = <0x0 0x20000>;
console-size = <0x0 0x80000>;
ftrace-size = <0x0 0x00000>;
pmsg-size = <0x0 0x50000>;
memory-region = <&ramoops_mem>;
};
reserved-memory {
#address-cells = <2>;
#size-cells = <2>;
@@ -80,6 +66,15 @@
reg = <0x0 0x0 0x0 0x0>;
};
ramoops: ramoops@110000 {
compatible = "ramoops";
reg = <0x0 0x110000 0x0 0xf0000>;
record-size = <0x20000>;
console-size = <0x80000>;
ftrace-size = <0x00000>;
pmsg-size = <0x50000>;
};
/* global autoconfigured region for contiguous allocations */
linux,cma {
compatible = "shared-dma-pool";
arch/arm64/boot/dts/rockchip/rk3368-xikp.dtsi
-14
View File
@@ -68,20 +68,6 @@
};
};
ramoops_mem: ramoops_mem {
reg = <0x0 0x110000 0x0 0xf0000>;
reg-names = "ramoops_mem";
};
ramoops {
compatible = "ramoops";
record-size = <0x0 0x20000>;
console-size = <0x0 0x80000>;
ftrace-size = <0x0 0x00000>;
pmsg-size = <0x0 0x50000>;
memory-region = <&ramoops_mem>;
};
sdio_pwrseq: sdio-pwrseq {
compatible = "mmc-pwrseq-simple";
clocks = <&rk818 1>;
arch/arm64/boot/dts/rockchip/rk3399-android.dtsi
+9 -14
View File
@@ -58,20 +58,6 @@
nvmem-cell-names = "id";
};
ramoops_mem: ramoops_mem {
reg = <0x0 0x110000 0x0 0xf0000>;
reg-names = "ramoops_mem";
};
ramoops {
compatible = "ramoops";
record-size = <0x0 0x20000>;
console-size = <0x0 0x80000>;
ftrace-size = <0x0 0x00000>;
pmsg-size = <0x0 0x50000>;
memory-region = <&ramoops_mem>;
};
fiq_debugger: fiq-debugger {
compatible = "rockchip,fiq-debugger";
rockchip,serial-id = <2>;
@@ -93,6 +79,15 @@
reg = <0x0 0x0 0x0 0x0>;
};
ramoops: ramoops@110000 {
compatible = "ramoops";
reg = <0x0 0x110000 0x0 0xf0000>;
record-size = <0x20000>;
console-size = <0x80000>;
ftrace-size = <0x00000>;
pmsg-size = <0x50000>;
};
secure_memory: secure-memory@20000000 {
compatible = "rockchip,secure-memory";
reg = <0x0 0x20000000 0x0 0x10000000>;
arch/arm64/boot/dts/rockchip/rk3399-firefly-android.dts
+9 -14
View File
@@ -63,20 +63,6 @@
nvmem-cell-names = "id";
};
ramoops_mem: ramoops_mem {
reg = <0x0 0x110000 0x0 0xf0000>;
reg-names = "ramoops_mem";
};
ramoops {
compatible = "ramoops";
record-size = <0x0 0x20000>;
console-size = <0x0 0x80000>;
ftrace-size = <0x0 0x00000>;
pmsg-size = <0x0 0x50000>;
memory-region = <&ramoops_mem>;
};
backlight: backlight {
compatible = "pwm-backlight";
pwms = <&pwm0 0 25000 0>;
@@ -173,6 +159,15 @@
compatible = "rockchip,stb-devinfo";
reg = <0x0 0x0 0x0 0x0>;
};
ramoops: ramoops@110000 {
compatible = "ramoops";
reg = <0x0 0x110000 0x0 0xf0000>;
record-size = <0x20000>;
console-size = <0x80000>;
ftrace-size = <0x00000>;
pmsg-size = <0x50000>;
};
};
rockchip-key {