shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 11:26:02 +09:00
Code Issues Packages Projects Releases Wiki Activity

arm64: dts: rockchip: move reserved_memory to rk3568.dtsi

Browse Source 
Change-Id: Ia8888142e718ac0c6a9d7aa777ffd25a44639cda
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
This commit is contained in:
Sandy Huang
2020-12-30 14:56:59 +08:00
committed by Tao Huang
parent c1d49010f6
commit 8862f1ad4d
3 changed files with 41 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
arch/arm64/boot/dts/rockchip/rk3568-android.dtsi
View File

@@ -22,34 +22,6 @@
status = "okay";
};
reserved-memory {
#address-cells = <2>;
#size-cells = <2>;
ranges;
drm_logo: drm-logo@00000000 {
compatible = "rockchip,drm-logo";
reg = <0x0 0x0 0x0 0x0>;
};
linux,cma {
compatible = "shared-dma-pool";
inactive;
reusable;
size = <0x0 (8 * 0x00100000)>;
linux,cma-default;
};
ramoops: ramoops@110000 {
compatible = "ramoops";
reg = <0x0 0x110000 0x0 0xf0000>;
record-size = <0x20000>;
console-size = <0x80000>;
ftrace-size = <0x00000>;
pmsg-size = <0x50000>;
};
};
debug: debug@fd904000 {
compatible = "rockchip,debug";
reg = <0x0 0xfd904000 0x0 0x1000>,
@@ -67,6 +39,25 @@
};
};
&reserved_memory {
linux,cma {
compatible = "shared-dma-pool";
inactive;
reusable;
size = <0x0 (512 * 0x00100000)>;
linux,cma-default;
};
ramoops: ramoops@110000 {
compatible = "ramoops";
reg = <0x0 0x110000 0x0 0xf0000>;
record-size = <0x20000>;
console-size = <0x80000>;
ftrace-size = <0x00000>;
pmsg-size = <0x50000>;
};
};
&rng {
status = "okay";
};

31
arch/arm64/boot/dts/rockchip/rk3568-linux.dtsi
View File

@@ -22,26 +22,6 @@
status = "okay";
};
reserved-memory {
#address-cells = <2>;
#size-cells = <2>;
ranges;
drm_logo: drm-logo@00000000 {
compatible = "rockchip,drm-logo";
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>;
};
};
debug: debug@fd904000 {
compatible = "rockchip,debug";
reg = <0x0 0xfd904000 0x0 0x1000>,
@@ -59,6 +39,17 @@
};
};
&reserved_memory {
ramoops: ramoops@110000 {
compatible = "ramoops";
reg = <0x0 0x110000 0x0 0xf0000>;
record-size = <0x20000>;
console-size = <0x80000>;
ftrace-size = <0x00000>;
pmsg-size = <0x50000>;
};
};
&rng {
status = "okay";
};

11
arch/arm64/boot/dts/rockchip/rk3568.dtsi
View File

@@ -250,6 +250,17 @@
method = "smc";
};
reserved_memory: reserved-memory {
#address-cells = <2>;
#size-cells = <2>;
ranges;
drm_logo: drm-logo@00000000 {
compatible = "rockchip,drm-logo";
reg = <0x0 0x0 0x0 0x0>;
};
};
thermal_zones: thermal-zones {
soc_thermal: soc-thermal {
polling-delay-passive = <20>; /* milliseconds */