From b65851e47217ade55c6eb4b6e6fcc501f903bb60 Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Thu, 10 Oct 2019 15:58:46 +0800 Subject: [PATCH] ARM: dts: rockchip: ramoops use DT reserved-memory bindings According to commit 529182e204db ("ramoops: use DT reserved-memory bindings") Change-Id: Id79d816604f096f4f2e6c25918e65327875cc647 Signed-off-by: Tao Huang --- arch/arm/boot/dts/rk3128h-box.dtsi | 16 ++++++---------- arch/arm/boot/dts/rk312x-android.dtsi | 16 ++++++---------- arch/arm/boot/dts/rk322x-android.dtsi | 16 ++++++---------- arch/arm/boot/dts/rk3288-android.dtsi | 18 +++++++----------- arch/arm/boot/dts/rk3288-firefly-rk808.dts | 16 ++++++---------- .../boot/dts/rk3308-dot-rk816-v10-aarch32.dts | 9 +++------ arch/arm/boot/dts/rk3308-dot-v10-aarch32.dts | 9 +++------ .../dts/rk3308-evb-dmic-i2s-v10-aarch32.dts | 9 +++------ .../dts/rk3308-evb-dmic-pdm-v11-aarch32.dts | 9 +++------ .../dts/rk3308-voice-module-v10-aarch32.dtsi | 9 +++------ .../dts/rk3308-voice-module-v11-aarch32.dtsi | 7 ++----- .../boot/dts/rk3308b-evb-amic-v10-aarch32.dts | 9 +++------ 12 files changed, 51 insertions(+), 92 deletions(-) diff --git a/arch/arm/boot/dts/rk3128h-box.dtsi b/arch/arm/boot/dts/rk3128h-box.dtsi index 44a077469fb2..3f8ab6e64e8b 100644 --- a/arch/arm/boot/dts/rk3128h-box.dtsi +++ b/arch/arm/boot/dts/rk3128h-box.dtsi @@ -45,20 +45,16 @@ reg = <0x80000000 0x0>; }; - ramoops_mem: ramoops@62e00000 { + ramoops: ramoops@62e00000 { + compatible = "ramoops"; reg = <0x62e00000 0xf0000>; + record-size = <0x20000>; + console-size = <0x80000>; + ftrace-size = <0x00000>; + pmsg-size = <0x50000>; }; }; - ramoops: ramoops { - compatible = "ramoops"; - record-size = <0x0 0x20000>; - console-size = <0x0 0x80000>; - ftrace-size = <0x0 0x00000>; - pmsg-size = <0x0 0x50000>; - memory-region = <&ramoops_mem>; - }; - gpio_keys: gpio-keys { status = "okay"; compatible = "gpio-keys"; diff --git a/arch/arm/boot/dts/rk312x-android.dtsi b/arch/arm/boot/dts/rk312x-android.dtsi index 6079cafca9a5..f676c820edf3 100644 --- a/arch/arm/boot/dts/rk312x-android.dtsi +++ b/arch/arm/boot/dts/rk312x-android.dtsi @@ -45,8 +45,13 @@ reg = <0x88000000 0x1800000>; }; - ramoops_mem: ramoops@62e00000 { + ramoops: ramoops@62e00000 { + compatible = "ramoops"; reg = <0x62e00000 0xf0000>; + record-size = <0x20000>; + console-size = <0x80000>; + ftrace-size = <0x00000>; + pmsg-size = <0x50000>; }; drm_logo: drm-logo@00000000 { @@ -54,15 +59,6 @@ reg = <0x0 0x0>; }; }; - - ramoops { - compatible = "ramoops"; - record-size = <0x0 0x20000>; - console-size = <0x0 0x80000>; - ftrace-size = <0x0 0x00000>; - pmsg-size = <0x0 0x50000>; - memory-region = <&ramoops_mem>; - }; }; &cif_new { diff --git a/arch/arm/boot/dts/rk322x-android.dtsi b/arch/arm/boot/dts/rk322x-android.dtsi index 3aec595f39b4..76647335789d 100644 --- a/arch/arm/boot/dts/rk322x-android.dtsi +++ b/arch/arm/boot/dts/rk322x-android.dtsi @@ -78,20 +78,16 @@ reg = <0x80000000 0x0>; }; - ramoops_mem: ramoops@62e00000 { + ramoops: ramoops@62e00000 { + compatible = "ramoops"; reg = <0x62e00000 0xf0000>; + record-size = <0x20000>; + console-size = <0x80000>; + ftrace-size = <0x00000>; + pmsg-size = <0x50000>; }; }; - ramoops { - compatible = "ramoops"; - record-size = <0x0 0x20000>; - console-size = <0x0 0x80000>; - ftrace-size = <0x0 0x00000>; - pmsg-size = <0x0 0x50000>; - memory-region = <&ramoops_mem>; - }; - psci { compatible = "arm,psci-1.0"; method = "smc"; diff --git a/arch/arm/boot/dts/rk3288-android.dtsi b/arch/arm/boot/dts/rk3288-android.dtsi index 8518ea6d0529..779fef867acd 100644 --- a/arch/arm/boot/dts/rk3288-android.dtsi +++ b/arch/arm/boot/dts/rk3288-android.dtsi @@ -123,25 +123,21 @@ }; reserved-memory { - ramoops_mem: ramoops@00000000 { + ramoops: ramoops@8000000 { + compatible = "ramoops"; reg = <0x0 0x8000000 0x0 0xF0000>; + record-size = <0x20000>; + console-size = <0x80000>; + ftrace-size = <0x00000>; + pmsg-size = <0x50000>; }; drm_logo: drm-logo@00000000 { - compatible = "rockchip,drm-logo"; + compatible = "rockchip,drm-logo"; reg = <0x0 0x0 0x0 0x0>; }; }; - 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 { compatible = "rockchip,fiq-debugger"; interrupts = ; diff --git a/arch/arm/boot/dts/rk3288-firefly-rk808.dts b/arch/arm/boot/dts/rk3288-firefly-rk808.dts index bc8a5ddb6cd3..091a2ad29a06 100644 --- a/arch/arm/boot/dts/rk3288-firefly-rk808.dts +++ b/arch/arm/boot/dts/rk3288-firefly-rk808.dts @@ -148,8 +148,13 @@ }; reserved-memory { - ramoops_mem: ramoops@00000000 { + ramoops: ramoops@8000000 { + compatible = "ramoops"; reg = <0x0 0x8000000 0x0 0xF0000>; + record-size = <0x0 0x20000>; + console-size = <0x0 0x80000>; + ftrace-size = <0x0 0x00000>; + pmsg-size = <0x0 0x50000>; }; drm_logo: drm-logo@00000000 { @@ -158,15 +163,6 @@ }; }; - 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 { compatible = "rockchip,fiq-debugger"; interrupts = ; diff --git a/arch/arm/boot/dts/rk3308-dot-rk816-v10-aarch32.dts b/arch/arm/boot/dts/rk3308-dot-rk816-v10-aarch32.dts index 8357cad9dad2..d17ed78e628c 100644 --- a/arch/arm/boot/dts/rk3308-dot-rk816-v10-aarch32.dts +++ b/arch/arm/boot/dts/rk3308-dot-rk816-v10-aarch32.dts @@ -419,13 +419,10 @@ }; }; -&ramoops_mem { - reg = <0x0 0x30000 0x0 0x20000>; -}; - &ramoops { - record-size = <0x0 0x00000>; - console-size = <0x0 0x20000>; + reg = <0x0 0x30000 0x0 0x20000>; + record-size = <0x00000>; + console-size = <0x20000>; }; &rockchip_suspend { diff --git a/arch/arm/boot/dts/rk3308-dot-v10-aarch32.dts b/arch/arm/boot/dts/rk3308-dot-v10-aarch32.dts index 56bad303c4a8..3e37c7e8058c 100644 --- a/arch/arm/boot/dts/rk3308-dot-v10-aarch32.dts +++ b/arch/arm/boot/dts/rk3308-dot-v10-aarch32.dts @@ -237,13 +237,10 @@ pinctrl-0 = <&pwm0_pin_pull_down>; }; -&ramoops_mem { - reg = <0x0 0x30000 0x0 0x20000>; -}; - &ramoops { - record-size = <0x0 0x00000>; - console-size = <0x0 0x20000>; + reg = <0x0 0x30000 0x0 0x20000>; + record-size = <0x00000>; + console-size = <0x20000>; }; &rockchip_suspend { diff --git a/arch/arm/boot/dts/rk3308-evb-dmic-i2s-v10-aarch32.dts b/arch/arm/boot/dts/rk3308-evb-dmic-i2s-v10-aarch32.dts index e5377f3cf3c3..6281081ed12f 100644 --- a/arch/arm/boot/dts/rk3308-evb-dmic-i2s-v10-aarch32.dts +++ b/arch/arm/boot/dts/rk3308-evb-dmic-i2s-v10-aarch32.dts @@ -10,11 +10,8 @@ compatible = "rockchip,rk3308-evb-dmic-i2s-v10-aarch32", "rockchip,rk3308"; }; -&ramoops_mem { - reg = <0x0 0x30000 0x0 0x20000>; -}; - &ramoops { - record-size = <0x0 0x00000>; - console-size = <0x0 0x20000>; + reg = <0x0 0x30000 0x0 0x20000>; + record-size = <0x00000>; + console-size = <0x20000>; }; diff --git a/arch/arm/boot/dts/rk3308-evb-dmic-pdm-v11-aarch32.dts b/arch/arm/boot/dts/rk3308-evb-dmic-pdm-v11-aarch32.dts index c388f279d23e..f9926444b204 100644 --- a/arch/arm/boot/dts/rk3308-evb-dmic-pdm-v11-aarch32.dts +++ b/arch/arm/boot/dts/rk3308-evb-dmic-pdm-v11-aarch32.dts @@ -10,11 +10,8 @@ compatible = "rockchip,rk3308-evb-dmic-pdm-v11-aarch32", "rockchip,rk3308"; }; -&ramoops_mem { - reg = <0x0 0x30000 0x0 0x20000>; -}; - &ramoops { - record-size = <0x0 0x00000>; - console-size = <0x0 0x20000>; + reg = <0x0 0x30000 0x0 0x20000>; + record-size = <0x00000>; + console-size = <0x20000>; }; diff --git a/arch/arm/boot/dts/rk3308-voice-module-v10-aarch32.dtsi b/arch/arm/boot/dts/rk3308-voice-module-v10-aarch32.dtsi index 2c69c9517876..a53b6d5215ea 100644 --- a/arch/arm/boot/dts/rk3308-voice-module-v10-aarch32.dtsi +++ b/arch/arm/boot/dts/rk3308-voice-module-v10-aarch32.dtsi @@ -234,13 +234,10 @@ status = "okay"; }; -&ramoops_mem { - reg = <0x0 0x30000 0x0 0x20000>; -}; - &ramoops { - record-size = <0x0 0x00000>; - console-size = <0x0 0x20000>; + reg = <0x0 0x30000 0x0 0x20000>; + record-size = <0x00000>; + console-size = <0x20000>; }; &rk_timer_rtc { diff --git a/arch/arm/boot/dts/rk3308-voice-module-v11-aarch32.dtsi b/arch/arm/boot/dts/rk3308-voice-module-v11-aarch32.dtsi index 96cf85ad7ac9..23f66804a2e0 100644 --- a/arch/arm/boot/dts/rk3308-voice-module-v11-aarch32.dtsi +++ b/arch/arm/boot/dts/rk3308-voice-module-v11-aarch32.dtsi @@ -278,12 +278,9 @@ }; &ramoops { - record-size = <0x0 0x00000>; - console-size = <0x0 0x20000>; -}; - -&ramoops_mem { reg = <0x0 0x30000 0x0 0x20000>; + record-size = <0x00000>; + console-size = <0x20000>; }; &rk_timer_rtc { diff --git a/arch/arm/boot/dts/rk3308b-evb-amic-v10-aarch32.dts b/arch/arm/boot/dts/rk3308b-evb-amic-v10-aarch32.dts index ed9abd93d7ab..318c711a961c 100644 --- a/arch/arm/boot/dts/rk3308b-evb-amic-v10-aarch32.dts +++ b/arch/arm/boot/dts/rk3308b-evb-amic-v10-aarch32.dts @@ -10,11 +10,8 @@ compatible = "rockchip,rk3308b-evb-amic-v10-aarch32", "rockchip,rk3308"; }; -&ramoops_mem { - reg = <0x0 0x30000 0x0 0x20000>; -}; - &ramoops { - record-size = <0x0 0x00000>; - console-size = <0x0 0x20000>; + reg = <0x0 0x30000 0x0 0x20000>; + record-size = <0x00000>; + console-size = <0x20000>; };