dts: add osd logo_reserved [1/1]
authorPengcheng Chen <pengcheng.chen@amlogic.com>
Tue, 3 Sep 2019 09:31:15 +0000 (17:31 +0800)
committerTao Zeng <tao.zeng@amlogic.com>
Thu, 5 Sep 2019 07:50:03 +0000 (00:50 -0700)
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>
15 files changed:
arch/arm/boot/dts/amlogic/gxl_p212_1g_buildroot.dts
arch/arm/boot/dts/amlogic/gxl_p212_2g_buildroot.dts
arch/arm/boot/dts/amlogic/gxl_p231_2g_buildroot.dts
arch/arm/boot/dts/amlogic/gxl_p241_1g_buildroot.dts
arch/arm/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts
arch/arm/boot/dts/amlogic/gxl_p400_2g.dts
arch/arm/boot/dts/amlogic/gxl_p401_2g.dts
arch/arm64/boot/dts/amlogic/gxl_p212_1g_buildroot.dts
arch/arm64/boot/dts/amlogic/gxl_p212_2g_buildroot.dts
arch/arm64/boot/dts/amlogic/gxl_p212_2g_drm_buildroot.dts
arch/arm64/boot/dts/amlogic/gxl_p231_2g_buildroot.dts
arch/arm64/boot/dts/amlogic/gxl_p241_1g_buildroot.dts
arch/arm64/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts
arch/arm64/boot/dts/amlogic/gxl_p400_2g.dts
arch/arm64/boot/dts/amlogic/gxl_p401_2g.dts

index b0e2707771b7b906a329eed0273c55aeef4613c5..12f0013aaa2164b66036778e56c7764af6b377db 100644 (file)
                        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
 
 
        meson-fb {
                compatible = "amlogic, meson-gxl";
-               memory-region = <&fb_reserved>;
+               memory-region = <&logo_reserved>;
                dev_name = "meson-fb";
                status = "okay";
                interrupts = <0 3 1
                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";
index 41f0b87a56be82945038b10979d06c4ba6fcce82..74ac46c77dc85908a948c68b304614beeebe7cf4 100644 (file)
                        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;
 
        meson-fb {
                compatible = "amlogic, meson-gxl";
+               memory-region = <&logo_reserved>;
                dev_name = "meson-fb";
                status = "okay";
                interrupts = <0 3 1
                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";
index 544fda8370bea49f471ca0dbc4ee956718d127ee..bcbc10aea11b33d5009f917bb6004feae566778a 100644 (file)
                        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
 
 
        meson-fb {
                compatible = "amlogic, meson-gxl";
-               memory-region = <&fb_reserved>;
+               memory-region = <&logo_reserved>;
                dev_name = "meson-fb";
                status = "okay";
                interrupts = <0 3 1
                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";
index 7cac9aead267c0c95d9d22dbacd1ee6dd281333d..c217fe4d367777501295068f9b685672ccbe4878 100644 (file)
                        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;
 
        meson-fb {
                compatible = "amlogic, meson-gxl";
+               memory-region = <&logo_reserved>;
                dev_name = "meson-fb";
                status = "okay";
                interrupts = <0 3 1
                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";
index d23e10b69dcc073397a26bc0bb309303ed845866..5294a4b151aa494f58bad2d2ec64de3ad7c02610 100644 (file)
                        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";
 
        meson-fb {
                compatible = "amlogic, meson-gxl";
+               memory-region = <&logo_reserved>;
                dev_name = "meson-fb";
                status = "okay";
                interrupts = <0 3 1
                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";
index f029da16596666b1764017be24dfcaabd4c887be..754516606e305690ada5557b9108c9d0f6ed47dc 100644 (file)
                        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>;
                };
        };
 
 
        meson-fb {
                compatible = "amlogic, meson-gxl";
-               memory-region = <&fb_reserved>;
+               memory-region = <&logo_reserved>;
                dev_name = "meson-fb";
                status = "okay";
                interrupts = <0 3 1
                display_size_default = <1920 1080 1920 3240 32>;
                /*1920*1080*4*3 = 0x17BB000*/
                mem_alloc = <1>;
-               logo_addr = "0x7dc00000";
+               logo_addr = "0x7f800000";
        };
 
        ge2d {
index 4ec562019712af77eb2a2696633aa8f7acfa7178..cdb27c8d519188e08e0b9476c3f9b38c7112908f 100644 (file)
                        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>;
                };
        };
 
 
        meson-fb {
                compatible = "amlogic, meson-gxl";
-               memory-region = <&fb_reserved>;
+               memory-region = <&logo_reserved>;
                dev_name = "meson-fb";
                status = "okay";
                interrupts = <0 3 1
                display_size_default = <1920 1080 1920 3240 32>;
                /*1920*1080*4*3 = 0x17BB000*/
                mem_alloc = <1>;
-               logo_addr = "0x7dc00000";
+               logo_addr = "0x7f800000";
        };
 
        ge2d {
index 576d02167e1f96f64347ab05bb17a621c47516b9..c55cb7f6a6f6a4972b5fb02783a07e008dfdeae8 100644 (file)
                        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
 
 
        meson-fb {
                compatible = "amlogic, meson-gxl";
-               memory-region = <&fb_reserved>;
+               memory-region = <&logo_reserved>;
                dev_name = "meson-fb";
                status = "okay";
                interrupts = <0 3 1
                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";
index a7cc856dae005d68aa39175e18ea9a31be1af9f6..e36ed5e146499f94c917a0e1b88cf5de56e9baf6 100644 (file)
                        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;
                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";
                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";
index c4642b58834799296dbaa0bf2250089c95946561..d84762b28d72fe552d6d2cd468d1d901a8f0c20d 100644 (file)
                        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;
                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";
                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";
index bf8c29fa050086d6d719000ca03155e9398539f2..c8e95a08f84b7359f66484fac1c950c86c4678d8 100644 (file)
                        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
 
 
        meson-fb {
                compatible = "amlogic, meson-gxl";
-               memory-region = <&fb_reserved>;
+               memory-region = <&logo_reserved>;
                dev_name = "meson-fb";
                status = "okay";
                interrupts = <0 3 1
                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";
index 219d9c641f65448afbfd9cdb3472e996b24a7e30..808726c878f4cbe058942d9360bb571f9fcf7486 100644 (file)
                        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;
        meson-fb {
                compatible = "amlogic, meson-gxl";
                dev_name = "meson-fb";
+               memory-region = <&logo_reserved>;
                status = "okay";
                interrupts = <0 3 1
                        0 89 1>;
                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";
index 6ae401f820b012d1a32f374825cc6a006dae8a97..3c0c432d6514f894a497839ae3d20c33e9d5106d 100644 (file)
                        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;
        meson-fb {
                compatible = "amlogic, meson-gxl";
                dev_name = "meson-fb";
+               memory-region = <&logo_reserved>;
                status = "okay";
                interrupts = <0 3 1
                        0 89 1>;
                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";
index fdd9e36ece42f6ede5bf332eb0bcdbde51387821..52e982640c9eb3cdc3a21711773fee093b5a0aaa 100644 (file)
                        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>;
                };
        };
 
 
        meson-fb {
                compatible = "amlogic, meson-gxl";
-               memory-region = <&fb_reserved>;
+               memory-region = <&logo_reserved>;
                dev_name = "meson-fb";
                status = "okay";
                interrupts = <0 3 1
                display_size_default = <1920 1080 1920 3240 32>;
                /*1920*1080*4*3 = 0x17BB000*/
                mem_alloc = <1>;
-               logo_addr = "0x7dc00000";
+               logo_addr = "0x7f800000";
        };
 
        ge2d {
index 7eabe0b221d7e711dd66cf74a05375c7015ac7af..1ecf2338a9c63992cb225db5a4d5cc016f36bb35 100644 (file)
                        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>;
                };
        };
 
 
        meson-fb {
                compatible = "amlogic, meson-gxl";
-               memory-region = <&fb_reserved>;
+               memory-region = <&logo_reserved>;
                dev_name = "meson-fb";
                status = "okay";
                interrupts = <0 3 1
                display_size_default = <1920 1080 1920 3240 32>;
                /*1920*1080*4*3 = 0x17BB000*/
                mem_alloc = <1>;
-               logo_addr = "0x7dc00000";
+               logo_addr = "0x7f800000";
        };
 
        ge2d {