dts: add osd logo_reserved [1/1]

PD#SWPL-13646

Problem:
uboot logo flashed

Solution:
add osd logo_reserved

Verify:
test pass on p212

Change-Id: I73d95faffea80c68e8d0a04750d33fd0c821ca44
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>

diff --git a/arch/arm/boot/dts/amlogic/gxl_p212_1g_buildroot.dts b/arch/arm/boot/dts/amlogic/gxl_p212_1g_buildroot.dts
index b0e2707..12f0013 100644 (file)
--- a/arch/arm/boot/dts/amlogic/gxl_p212_1g_buildroot.dts
+++ b/arch/arm/boot/dts/amlogic/gxl_p212_1g_buildroot.dts
@@ -61,12 +61,12 @@
                        reg = <0x05300000 0x2000000>;
                        no-map;
                };
-               fb_reserved:linux,meson-fb {
+               logo_reserved:linux,meson-fb {
                        compatible = "shared-dma-pool";
                        reusable;
-                       size = <0x2400000>;
+                       size = <0x800000>;
                        alignment = <0x400000>;
-                       alloc-ranges = <0x3dc00000 0x2400000>;
+                       alloc-ranges = <0x3f800000 0x800000>;
                };
                //don't put other dts in front of fb_reserved
 
@@ -710,7 +710,7 @@
 
        meson-fb {
                compatible = "amlogic, meson-gxl";
-               memory-region = <&fb_reserved>;
+               memory-region = <&logo_reserved>;
                dev_name = "meson-fb";
                status = "okay";
                interrupts = <0 3 1
@@ -724,7 +724,7 @@
                display_size_default = <1920 1080 1920 3240 32>;
                /*1920*1080*4*3 = 0x17BB000*/
                mem_alloc = <1>;
-               logo_addr = "0x3dc00000";
+               logo_addr = "0x3f800000";
        };
        ge2d {
                compatible = "amlogic, ge2d-gxl";

diff --git a/arch/arm/boot/dts/amlogic/gxl_p212_2g_buildroot.dts b/arch/arm/boot/dts/amlogic/gxl_p212_2g_buildroot.dts
index 41f0b87..74ac46c 100644 (file)
--- a/arch/arm/boot/dts/amlogic/gxl_p212_2g_buildroot.dts
+++ b/arch/arm/boot/dts/amlogic/gxl_p212_2g_buildroot.dts
@@ -63,6 +63,13 @@
                        reg = <0x05300000 0x2000000>;
                        no-map;
                };
+               logo_reserved:linux,meson-fb {
+                       compatible = "shared-dma-pool";
+                       reusable;
+                       size = <0x800000>;
+                       alignment = <0x400000>;
+                       alloc-ranges = <0x7f800000 0x800000>;
+               };
                ion_reserved:linux,ion-dev {
                        compatible = "shared-dma-pool";
                        reusable;
@@ -711,6 +718,7 @@
 
        meson-fb {
                compatible = "amlogic, meson-gxl";
+               memory-region = <&logo_reserved>;
                dev_name = "meson-fb";
                status = "okay";
                interrupts = <0 3 1
@@ -724,7 +732,7 @@
                display_size_default = <1920 1080 1920 3240 32>;
                /*1920*1080*4*3 = 0x17BB000*/
                mem_alloc = <1>;
-               logo_addr = "0x7dc00000";
+               logo_addr = "0x7f800000";
        };
        ge2d {
                compatible = "amlogic, ge2d-gxl";

diff --git a/arch/arm/boot/dts/amlogic/gxl_p231_2g_buildroot.dts b/arch/arm/boot/dts/amlogic/gxl_p231_2g_buildroot.dts
index 544fda8..bcbc10a 100644 (file)
--- a/arch/arm/boot/dts/amlogic/gxl_p231_2g_buildroot.dts
+++ b/arch/arm/boot/dts/amlogic/gxl_p231_2g_buildroot.dts
@@ -69,12 +69,12 @@
                        reg = <0x05300000 0x2000000>;
                        no-map;
                };
-               fb_reserved:linux,meson-fb {
+               logo_reserved:linux,meson-fb {
                        compatible = "shared-dma-pool";
                        reusable;
-                       size = <0x2400000>;
+                       size = <0x800000>;
                        alignment = <0x400000>;
-                       alloc-ranges = <0x7dc00000 0x2400000>;
+                       alloc-ranges = <0x7f800000 0x800000>;
                };
                //don't put other dts in front of fb_reserved
 
@@ -656,7 +656,7 @@
 
        meson-fb {
                compatible = "amlogic, meson-gxl";
-               memory-region = <&fb_reserved>;
+               memory-region = <&logo_reserved>;
                dev_name = "meson-fb";
                status = "okay";
                interrupts = <0 3 1
@@ -670,7 +670,7 @@
                display_size_default = <1920 1080 1920 3240 32>;
                /*1920*1080*4*3 = 0x17BB000*/
                mem_alloc = <1>;
-               logo_addr = "0x7dc00000";
+               logo_addr = "0x7f800000";
        };
        ge2d {
                compatible = "amlogic, ge2d-gxl";

diff --git a/arch/arm/boot/dts/amlogic/gxl_p241_1g_buildroot.dts b/arch/arm/boot/dts/amlogic/gxl_p241_1g_buildroot.dts
index 7cac9ae..c217fe4 100644 (file)
--- a/arch/arm/boot/dts/amlogic/gxl_p241_1g_buildroot.dts
+++ b/arch/arm/boot/dts/amlogic/gxl_p241_1g_buildroot.dts
@@ -71,6 +71,13 @@
                        reg = <0x05300000 0x2000000>;
                        no-map;
                };
+               logo_reserved:linux,meson-fb {
+                       compatible = "shared-dma-pool";
+                       reusable;
+                       size = <0x400000>;
+                       alignment = <0x400000>;
+                       alloc-ranges = <0x3fc00000 0x400000>;
+               };
                ion_reserved:linux,ion-dev {
                        compatible = "shared-dma-pool";
                        reusable;
@@ -781,6 +788,7 @@
 
        meson-fb {
                compatible = "amlogic, meson-gxl";
+               memory-region = <&logo_reserved>;
                dev_name = "meson-fb";
                status = "okay";
                interrupts = <0 3 1
@@ -794,7 +802,7 @@
                display_size_default = <1280 720 1280 2160 32>;
                /*1920*1080*4*3 = 0x17BB000*/
                mem_alloc = <1>;
-               logo_addr = "0x3f000000";
+               logo_addr = "0x3fc00000";
        };
        ge2d {
                compatible = "amlogic, ge2d-gxl";

diff --git a/arch/arm/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts b/arch/arm/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts
index d23e10b..5294a4b 100644 (file)
--- a/arch/arm/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts
+++ b/arch/arm/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts
@@ -71,13 +71,20 @@
                        reg = <0x05300000 0x2000000>;
                        no-map;
                };
+               logo_reserved:linux,meson-fb {
+                       compatible = "shared-dma-pool";
+                       reusable;
+                       size = <0x400000>;
+                       alignment = <0x400000>;
+                       alloc-ranges = <0x3fc00000 0x400000>;
+               };
+               //don't put other dts in front of logo_reserved
                ion_reserved:linux,ion-dev {
                        compatible = "shared-dma-pool";
                        reusable;
                        size = <0x8000000>;
                        alignment = <0x400000>;
                };
-               //don't put other dts in front of fb_reserved
 
                //di_reserved:linux,di {
                //      compatible = "amlogic, di-mem";
@@ -780,6 +787,7 @@
 
        meson-fb {
                compatible = "amlogic, meson-gxl";
+               memory-region = <&logo_reserved>;
                dev_name = "meson-fb";
                status = "okay";
                interrupts = <0 3 1
@@ -793,7 +801,7 @@
                display_size_default = <1280 720 1280 2160 32>;
                /*1920*1080*4*3 = 0x17BB000*/
                mem_alloc = <1>;
-               logo_addr = "0x3f000000";
+               logo_addr = "0x3fc00000";
        };
        ge2d {
                compatible = "amlogic, ge2d-gxl";

diff --git a/arch/arm/boot/dts/amlogic/gxl_p400_2g.dts b/arch/arm/boot/dts/amlogic/gxl_p400_2g.dts
index f029da1..7545166 100644 (file)
--- a/arch/arm/boot/dts/amlogic/gxl_p400_2g.dts
+++ b/arch/arm/boot/dts/amlogic/gxl_p400_2g.dts
@@ -67,12 +67,12 @@
                        reg = <0x05300000 0x2000000>;
                        no-map;
                };
-               fb_reserved:linux,meson-fb {
+               logo_reserved:linux,meson-fb {
                        compatible = "shared-dma-pool";
                        reusable;
-                       size = <0x2400000>;
+                       size = <0x800000>;
                        alignment = <0x400000>;
-                       alloc-ranges = <0x7dc00000 0x2400000>;
+                       alloc-ranges = <0x7f800000 0x800000>;
                };
        };
 
@@ -470,7 +470,7 @@
 
        meson-fb {
                compatible = "amlogic, meson-gxl";
-               memory-region = <&fb_reserved>;
+               memory-region = <&logo_reserved>;
                dev_name = "meson-fb";
                status = "okay";
                interrupts = <0 3 1
@@ -484,7 +484,7 @@
                display_size_default = <1920 1080 1920 3240 32>;
                /*1920*1080*4*3 = 0x17BB000*/
                mem_alloc = <1>;
-               logo_addr = "0x7dc00000";
+               logo_addr = "0x7f800000";
        };
 
        ge2d {

diff --git a/arch/arm/boot/dts/amlogic/gxl_p401_2g.dts b/arch/arm/boot/dts/amlogic/gxl_p401_2g.dts
index 4ec5620..cdb27c8 100644 (file)
--- a/arch/arm/boot/dts/amlogic/gxl_p401_2g.dts
+++ b/arch/arm/boot/dts/amlogic/gxl_p401_2g.dts
@@ -67,12 +67,12 @@
                        reg = <0x05300000 0x2000000>;
                        no-map;
                };
-               fb_reserved:linux,meson-fb {
+               logo_reserved:linux,meson-fb {
                        compatible = "shared-dma-pool";
                        reusable;
-                       size = <0x2400000>;
+                       size = <0x800000>;
                        alignment = <0x400000>;
-                       alloc-ranges = <0x7dc00000 0x2400000>;
+                       alloc-ranges = <0x7f800000 0x800000>;
                };
        };
 
@@ -558,7 +558,7 @@
 
        meson-fb {
                compatible = "amlogic, meson-gxl";
-               memory-region = <&fb_reserved>;
+               memory-region = <&logo_reserved>;
                dev_name = "meson-fb";
                status = "okay";
                interrupts = <0 3 1
@@ -572,7 +572,7 @@
                display_size_default = <1920 1080 1920 3240 32>;
                /*1920*1080*4*3 = 0x17BB000*/
                mem_alloc = <1>;
-               logo_addr = "0x7dc00000";
+               logo_addr = "0x7f800000";
        };
 
        ge2d {

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p212_1g_buildroot.dts b/arch/arm64/boot/dts/amlogic/gxl_p212_1g_buildroot.dts
index 576d021..c55cb7f 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p212_1g_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p212_1g_buildroot.dts
@@ -61,12 +61,12 @@
                        reg = <0x0 0x05300000 0x0 0x2000000>;
                        no-map;
                };
-               fb_reserved:linux,meson-fb {
+               logo_reserved:linux,meson-fb {
                        compatible = "shared-dma-pool";
                        reusable;
-                       size = <0x0 0x2400000>;
+                       size = <0x0 0x800000>;
                        alignment = <0x0 0x400000>;
-                       alloc-ranges = <0x0 0x3dc00000 0x0 0x2400000>;
+                       alloc-ranges = <0x0 0x3f800000 0x0 0x800000>;
                };
                //don't put other dts in front of fb_reserved
 
@@ -709,7 +709,7 @@
 
        meson-fb {
                compatible = "amlogic, meson-gxl";
-               memory-region = <&fb_reserved>;
+               memory-region = <&logo_reserved>;
                dev_name = "meson-fb";
                status = "okay";
                interrupts = <0 3 1
@@ -723,7 +723,7 @@
                display_size_default = <1920 1080 1920 3240 32>;
                /*1920*1080*4*3 = 0x17BB000*/
                mem_alloc = <1>;
-               logo_addr = "0x3dc00000";
+               logo_addr = "0x3f800000";
        };
        ge2d {
                compatible = "amlogic, ge2d-gxl";

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p212_2g_buildroot.dts b/arch/arm64/boot/dts/amlogic/gxl_p212_2g_buildroot.dts
index a7cc856..e36ed5e 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p212_2g_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p212_2g_buildroot.dts
@@ -63,6 +63,13 @@
                        reg = <0x0 0x05300000 0x0 0x2000000>;
                        no-map;
                };
+               logo_reserved:linux,meson-fb {
+                       compatible = "shared-dma-pool";
+                       reusable;
+                       size = <0x0 0x800000>;
+                       alignment = <0x0 0x400000>;
+                       alloc-ranges = <0x0 0x7f800000 0x0 0x800000>;
+               };
                ion_reserved:linux,ion-dev {
                        compatible = "shared-dma-pool";
                        reusable;
@@ -713,6 +720,7 @@
                compatible = "amlogic, meson-gxl";
                dev_name = "meson-fb";
                status = "okay";
+               memory-region = <&logo_reserved>;
                interrupts = <0 3 1
                        0 89 1>;
                interrupt-names = "viu-vsync", "rdma";
@@ -724,7 +732,7 @@
                display_size_default = <1920 1080 1920 3240 32>;
                /*1920*1080*4*3 = 0x17BB000*/
                mem_alloc = <1>;
-               logo_addr = "0x7dc00000";
+               logo_addr = "0x7f800000";
        };
        ge2d {
                compatible = "amlogic, ge2d-gxl";

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p212_2g_drm_buildroot.dts b/arch/arm64/boot/dts/amlogic/gxl_p212_2g_drm_buildroot.dts
index c4642b5..d84762b 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p212_2g_drm_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p212_2g_drm_buildroot.dts
@@ -63,6 +63,13 @@
                        reg = <0x0 0x05300000 0x0 0x2000000>;
                        no-map;
                };
+               logo_reserved:linux,meson-fb {
+                       compatible = "shared-dma-pool";
+                       reusable;
+                       size = <0x0 0x800000>;
+                       alignment = <0x0 0x400000>;
+                       alloc-ranges = <0x0 0x7f800000 0x0 0x800000>;
+               };
                ion_reserved:linux,ion-dev {
                        compatible = "shared-dma-pool";
                        reusable;
@@ -713,6 +720,7 @@
                compatible = "amlogic, meson-gxl";
                dev_name = "meson-fb";
                status = "disable";
+               memory-region = <&logo_reserved>;
                interrupts = <0 3 1
                        0 89 1>;
                interrupt-names = "viu-vsync", "rdma";
@@ -724,7 +732,7 @@
                display_size_default = <1920 1080 1920 3240 32>;
                /*1920*1080*4*3 = 0x17BB000*/
                mem_alloc = <1>;
-               logo_addr = "0x7dc00000";
+               logo_addr = "0x7f800000";
        };
        ge2d {
                compatible = "amlogic, ge2d-gxl";

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p231_2g_buildroot.dts b/arch/arm64/boot/dts/amlogic/gxl_p231_2g_buildroot.dts
index bf8c29f..c8e95a0 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p231_2g_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p231_2g_buildroot.dts
@@ -69,12 +69,12 @@
                        reg = <0x0 0x05300000 0x0 0x2000000>;
                        no-map;
                };
-               fb_reserved:linux,meson-fb {
+               logo_reserved:linux,meson-fb {
                        compatible = "shared-dma-pool";
                        reusable;
-                       size = <0x0 0x2400000>;
+                       size = <0x0 0x800000>;
                        alignment = <0x0 0x400000>;
-                       alloc-ranges = <0x0 0x7dc00000 0x0 0x2400000>;
+                       alloc-ranges = <0x0 0x7f800000 0x0 0x800000>;
                };
                //don't put other dts in front of fb_reserved
 
@@ -656,7 +656,7 @@
 
        meson-fb {
                compatible = "amlogic, meson-gxl";
-               memory-region = <&fb_reserved>;
+               memory-region = <&logo_reserved>;
                dev_name = "meson-fb";
                status = "okay";
                interrupts = <0 3 1
@@ -670,7 +670,7 @@
                display_size_default = <1920 1080 1920 3240 32>;
                /*1920*1080*4*3 = 0x17BB000*/
                mem_alloc = <1>;
-               logo_addr = "0x7dc00000";
+               logo_addr = "0x7f800000";
        };
        ge2d {
                compatible = "amlogic, ge2d-gxl";

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p241_1g_buildroot.dts b/arch/arm64/boot/dts/amlogic/gxl_p241_1g_buildroot.dts
index 219d9c6..808726c 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p241_1g_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p241_1g_buildroot.dts
@@ -71,6 +71,13 @@
                        reg = <0x0 0x05300000 0x0 0x2000000>;
                        no-map;
                };
+               logo_reserved:linux,meson-fb {
+                       compatible = "shared-dma-pool";
+                       reusable;
+                       size = <0x0 0x400000>;
+                       alignment = <0x0 0x400000>;
+                       alloc-ranges = <0x0 0x3fc00000 0x0 0x400000>;
+               };
                ion_reserved:linux,ion-dev {
                        compatible = "shared-dma-pool";
                        reusable;
@@ -781,6 +788,7 @@
        meson-fb {
                compatible = "amlogic, meson-gxl";
                dev_name = "meson-fb";
+               memory-region = <&logo_reserved>;
                status = "okay";
                interrupts = <0 3 1
                        0 89 1>;
@@ -793,7 +801,7 @@
                display_size_default = <1280 720 1280 2160 32>;
                /*1920*1080*4*3 = 0x17BB000*/
                mem_alloc = <1>;
-               logo_addr = "0x3f000000";
+               logo_addr = "0x3fc00000";
        };
        ge2d {
                compatible = "amlogic, ge2d-gxl";

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts b/arch/arm64/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts
index 6ae401f..3c0c432 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts
@@ -71,6 +71,13 @@
                        reg = <0x0 0x05300000 0x0 0x2000000>;
                        no-map;
                };
+               logo_reserved:linux,meson-fb {
+                       compatible = "shared-dma-pool";
+                       reusable;
+                       size = <0x0 0x400000>;
+                       alignment = <0x0 0x400000>;
+                       alloc-ranges = <0x0 0x3fc00000 0x0 0x400000>;
+               };
                ion_reserved:linux,ion-dev {
                        compatible = "shared-dma-pool";
                        reusable;
@@ -780,6 +787,7 @@
        meson-fb {
                compatible = "amlogic, meson-gxl";
                dev_name = "meson-fb";
+               memory-region = <&logo_reserved>;
                status = "okay";
                interrupts = <0 3 1
                        0 89 1>;
@@ -792,7 +800,7 @@
                display_size_default = <1280 720 1280 2160 32>;
                /*1920*1080*4*3 = 0x17BB000*/
                mem_alloc = <1>;
-               logo_addr = "0x3f000000";
+               logo_addr = "0x3fc00000";
        };
        ge2d {
                compatible = "amlogic, ge2d-gxl";

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p400_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_p400_2g.dts
index fdd9e36..52e9826 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p400_2g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p400_2g.dts
@@ -67,12 +67,12 @@
                        reg = <0x0 0x05300000 0x0 0x2000000>;
                        no-map;
                };
-               fb_reserved:linux,meson-fb {
+               logo_reserved:linux,meson-fb {
                        compatible = "shared-dma-pool";
                        reusable;
-                       size = <0x0 0x2400000>;
+                       size = <0x0 0x800000>;
                        alignment = <0x0 0x400000>;
-                       alloc-ranges = <0x0 0x7dc00000 0x0 0x2400000>;
+                       alloc-ranges = <0x0 0x7f800000 0x0 0x800000>;
                };
        };
 
@@ -470,7 +470,7 @@
 
        meson-fb {
                compatible = "amlogic, meson-gxl";
-               memory-region = <&fb_reserved>;
+               memory-region = <&logo_reserved>;
                dev_name = "meson-fb";
                status = "okay";
                interrupts = <0 3 1
@@ -484,7 +484,7 @@
                display_size_default = <1920 1080 1920 3240 32>;
                /*1920*1080*4*3 = 0x17BB000*/
                mem_alloc = <1>;
-               logo_addr = "0x7dc00000";
+               logo_addr = "0x7f800000";
        };
 
        ge2d {

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p401_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_p401_2g.dts
index 7eabe0b..1ecf233 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p401_2g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p401_2g.dts
@@ -67,12 +67,12 @@
                        reg = <0x0 0x05300000 0x0 0x2000000>;
                        no-map;
                };
-               fb_reserved:linux,meson-fb {
+               logo_reserved:linux,meson-fb {
                        compatible = "shared-dma-pool";
                        reusable;
-                       size = <0x0 0x2400000>;
+                       size = <0x0 0x800000>;
                        alignment = <0x0 0x400000>;
-                       alloc-ranges = <0x0 0x7dc00000 0x0 0x2400000>;
+                       alloc-ranges = <0x0 0x7f800000 0x0 0x800000>;
                };
        };
 
@@ -558,7 +558,7 @@
 
        meson-fb {
                compatible = "amlogic, meson-gxl";
-               memory-region = <&fb_reserved>;
+               memory-region = <&logo_reserved>;
                dev_name = "meson-fb";
                status = "okay";
                interrupts = <0 3 1
@@ -572,7 +572,7 @@
                display_size_default = <1920 1080 1920 3240 32>;
                /*1920*1080*4*3 = 0x17BB000*/
                mem_alloc = <1>;
-               logo_addr = "0x7dc00000";
+               logo_addr = "0x7f800000";
        };
 
        ge2d {