dts: dts memory is incorrectly allocated on t5w [2/2]

PD#SWPL-157900

Problem:
dts memory is incorrectly allocated

Solution:
change the memory allocate

Verify:
t5w

Change-Id: I5a3be243460bbda1bde6592f1ff4aa10e675b94f
Signed-off-by: zhou.ning <zhou.ning@amlogic.com>
This commit is contained in:
zhou.ning
2024-02-22 02:54:16 +00:00
committed by gerrit autosubmit
parent b2e9135b64
commit bd85ee3570
9 changed files with 25 additions and 27 deletions
@@ -44,7 +44,7 @@
/* global autoconfigured region for contiguous allocations */
ramoops@0x07400000 {
compatible = "ramoops";
reg = <0x0 0x07400000 0x0 0x00100000>;
reg = <0x07400000 0x00100000>;
record-size = <0x20000>;
console-size = <0x40000>;
ftrace-size = <0x80000>;
@@ -44,7 +44,7 @@
/* global autoconfigured region for contiguous allocations */
ramoops@0x07400000 {
compatible = "ramoops";
reg = <0x0 0x07400000 0x0 0x00100000>;
reg = <0x07400000 0x00100000>;
record-size = <0x20000>;
console-size = <0x40000>;
ftrace-size = <0x80000>;
@@ -84,12 +84,12 @@
/* keep sync with fb */
/* fox example:logo_addr = "0x3f800000"*/
alignment = <0x400000>;
reg = <0x2f800000 0x800000>;
reg = <0x2ec00000 0x800000>;
};
lcd_tcon_reserved:linux,lcd_tcon {
compatible = "amlogic, lcd_tcon";
reg = <0x2ec00000 0x00c00000>;
reg = <0x2f400000 0x00c00000>;
no-map;
};
@@ -112,7 +112,7 @@
*/
size = <0x01400000>;
alignment = <0x400000>;
alloc-ranges = <0x00000000 0x30000000>;
alloc-ranges = <0x00000000 0x2ec00000>;
};
codec_mm_cma:linux,codec_mm_cma {
@@ -189,7 +189,7 @@
reusable;
size = <0x0>;
alignment = <0x400000>;
alloc-ranges = <0x00000000 0x30000000>;
alloc-ranges = <0x00000000 0x2ec00000>;
};
ion_fb_reserved:linux,ion-fb {
@@ -197,7 +197,7 @@
reusable;
size = <0x0>;
alignment = <0x400000>;
alloc-ranges = <0x00000000 0x30000000>;
alloc-ranges = <0x00000000 0x2ec00000>;
};
ldc_mem_reserved:linux,ldc_mem {
@@ -205,7 +205,7 @@
reusable;
size = <0x400000>;
alignment = <0x400000>;
alloc-ranges = <0x00000000 0x30000000>;
alloc-ranges = <0x00000000 0x2ec00000>;
};
};
@@ -1544,7 +1544,7 @@
status = "disabled";
display_size_default = <1920 1080 1920 2160 32>;
mem_size = <0x00800000 0x1980000 0x100000 0x100000>;
logo_addr = "0x2f800000";
logo_addr = "0x2ec00000";
/* display_device_cnt = <2>; */ /* for dual screen upport */
mem_alloc = <0>;
pxp_mode = <0>; /** 0:normal mode 1:pxp mode */
@@ -1552,7 +1552,7 @@
&drm_vpu {
status = "okay";
logo_addr = "0x2f800000";
logo_addr = "0x2ec00000";
connectors_dev: port@1 {
drm_to_lcd0: endpoint@0 {
reg = <0>;
@@ -44,7 +44,7 @@
/* global autoconfigured region for contiguous allocations */
ramoops@0x07400000 {
compatible = "ramoops";
reg = <0x0 0x07400000 0x0 0x00100000>;
reg = <0x07400000 0x00100000>;
record-size = <0x20000>;
console-size = <0x40000>;
ftrace-size = <0x80000>;
@@ -44,7 +44,7 @@
/* global autoconfigured region for contiguous allocations */
ramoops@0x07400000 {
compatible = "ramoops";
reg = <0x0 0x07400000 0x0 0x00100000>;
reg = <0x07400000 0x00100000>;
record-size = <0x20000>;
console-size = <0x40000>;
ftrace-size = <0x80000>;
@@ -84,12 +84,12 @@
/* keep sync with fb */
/* fox example:logo_addr = "0x2ec00000"*/
alignment = <0x400000>;
reg = <0x2f800000 0x800000>;
reg = <0x2ec00000 0x800000>;
};
lcd_tcon_reserved:linux,lcd_tcon {
compatible = "amlogic, lcd_tcon";
reg = <0x2ec00000 0x00c00000>;
reg = <0x2f400000 0x00c00000>;
no-map;
};
@@ -112,7 +112,7 @@
*/
size = <0x01400000>;
alignment = <0x400000>;
alloc-ranges = <0x00000000 0x30000000>;
alloc-ranges = <0x00000000 0x2ec00000>;
};
codec_mm_cma:linux,codec_mm_cma {
@@ -189,7 +189,7 @@
reusable;
size = <0x0>;
alignment = <0x400000>;
alloc-ranges = <0x00000000 0x30000000>;
alloc-ranges = <0x00000000 0x2ec00000>;
};
ion_fb_reserved:linux,ion-fb {
@@ -197,7 +197,7 @@
reusable;
size = <0x0>;
alignment = <0x400000>;
alloc-ranges = <0x00000000 0x30000000>;
alloc-ranges = <0x00000000 0x2ec00000>;
};
ldc_mem_reserved:linux,ldc_mem {
@@ -205,7 +205,7 @@
reusable;
size = <0x400000>;
alignment = <0x400000>;
alloc-ranges = <0x00000000 0x30000000>;
alloc-ranges = <0x00000000 0x2ec00000>;
};
};
@@ -1545,7 +1545,7 @@
status = "disabled";
display_size_default = <1920 1080 1920 2160 32>;
mem_size = <0x00800000 0x1980000 0x100000 0x100000>;
logo_addr = "0x2f800000";
logo_addr = "0x2ec00000";
/* display_device_cnt = <2>; */ /* for dual screen upport */
mem_alloc = <0>;
pxp_mode = <0>; /** 0:normal mode 1:pxp mode */
@@ -1553,7 +1553,7 @@
&drm_vpu {
status = "okay";
logo_addr = "0x2f800000";
logo_addr = "0x2ec00000";
connectors_dev: port@1 {
drm_to_lcd0: endpoint@0 {
reg = <0>;
@@ -44,7 +44,7 @@
/* global autoconfigured region for contiguous allocations */
ramoops@0x07400000 {
compatible = "ramoops";
reg = <0x0 0x07400000 0x0 0x00100000>;
reg = <0x07400000 0x00100000>;
record-size = <0x20000>;
console-size = <0x40000>;
ftrace-size = <0x80000>;
@@ -44,7 +44,7 @@
/* global autoconfigured region for contiguous allocations */
ramoops@0x07400000 {
compatible = "ramoops";
reg = <0x0 0x07400000 0x0 0x00100000>;
reg = <0x07400000 0x00100000>;
record-size = <0x20000>;
console-size = <0x40000>;
ftrace-size = <0x80000>;
@@ -45,7 +45,7 @@
/* global autoconfigured region for contiguous allocations */
ramoops@0x07400000 {
compatible = "ramoops";
reg = <0x0 0x07400000 0x0 0x00100000>;
reg = <0x07400000 0x00100000>;
record-size = <0x20000>;
console-size = <0x40000>;
ftrace-size = <0x80000>;
@@ -80,8 +80,7 @@
};
logo_reserved:linux,meson-fb {
compatible = "shared-dma-pool";
reusable;
compatible = "amlogic, meson-fb";
/* keep sync with fb */
/* fox example:logo_addr = "0x27000000"*/
alignment = <0x0 0x400000>;
@@ -80,8 +80,7 @@
};
logo_reserved:linux,meson-fb {
compatible = "shared-dma-pool";
reusable;
compatible = "amlogic, meson-fb";
/* keep sync with fb */
/* fox example:logo_addr = "0x2ec00000"*/
alignment = <0x0 0x400000>;