dts: fix fb_reserved/logo_reserved alloc failed

PD#150868: fix fb_reserved/logo_reserved alloc failed

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

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts b/arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts
index 51bb5ac..2e8cf5a 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts
@@ -63,6 +63,14 @@
                        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 0x3f800000 0x0 0x800000>;
+               };
+               //don't put other dts in front of logo_reserved
 
                //di_reserved:linux,di {
                //      compatible = "amlogic, di-mem";
@@ -77,13 +85,6 @@
                        size = <0x0 0x2000000>;
                        alignment = <0x0 0x400000>;
                };
-               logo_reserved:linux,meson-fb {
-                       compatible = "shared-dma-pool";
-                       reusable;
-                       size = <0x0 0x800000>;
-                       alignment = <0x0 0x400000>;
-                       alloc-ranges = <0x0 0x3f800000 0x0 0x800000>;
-               };
                ion_reserved:linux,ion-dev {
                        compatible = "shared-dma-pool";
                        reusable;

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 74af147..e18dc8e 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p212_1g_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p212_1g_buildroot.dts
@@ -34,7 +34,9 @@
                serial3 = &uart_C;
                serial4 = &uart_AO_B;
        };
-
+       ion_dev {
+               compatible = "amlogic, ion_dev";
+       };
        memory@00000000 {
                device_type = "memory";
                linux,usable-memory = <0x0 0x0100000 0x0 0x3ff00000>;
@@ -58,6 +60,14 @@
                        reg = <0x0 0x05300000 0x0 0x2000000>;
                        no-map;
                };
+               fb_reserved:linux,meson-fb {
+                       compatible = "shared-dma-pool";
+                       reusable;
+                       size = <0x0 0x2400000>;
+                       alignment = <0x0 0x400000>;
+                       alloc-ranges = <0x0 0x3dc00000 0x0 0x2400000>;
+               };
+               //don't put other dts in front of fb_reserved
 
                //di_reserved:linux,di {
                //      compatible = "amlogic, di-mem";
@@ -72,13 +82,6 @@
                        size = <0x0 0x2000000>;
                        alignment = <0x0 0x400000>;
                };
-               fb_reserved:linux,meson-fb {
-                       compatible = "shared-dma-pool";
-                       reusable;
-                       size = <0x0 0x2400000>;
-                       alignment = <0x0 0x400000>;
-                       alloc-ranges = <0x0 0x3dc00000 0x0 0x2400000>;
-               };
                /*  vdin0 CMA pool */
                //vdin0_cma_reserved:linux,vdin0_cma {
                //      compatible = "shared-dma-pool";

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts
index db22f4f..1ff5de5 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts
@@ -72,6 +72,14 @@
                        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>;
+               };
+               //don't put other dts in front of logo_reserved
 
                //di_reserved:linux,di {
                //      compatible = "amlogic, di-mem";
@@ -86,13 +94,6 @@
                        size = <0x0 0x2000000>;
                        alignment = <0x0 0x400000>;
                };
-               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;

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 47b0f7c..08a0c31 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p212_2g_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p212_2g_buildroot.dts
@@ -35,7 +35,9 @@
                serial3 = &uart_C;
                serial4 = &uart_AO_B;
        };
-
+       ion_dev {
+               compatible = "amlogic, ion_dev";
+       };
        memory@00000000 {
                device_type = "memory";
                linux,usable-memory = <0x0 0x0100000 0x0 0x7ff00000>;
@@ -59,6 +61,14 @@
                        reg = <0x0 0x05300000 0x0 0x2000000>;
                        no-map;
                };
+               fb_reserved:linux,meson-fb {
+                       compatible = "shared-dma-pool";
+                       reusable;
+                       size = <0x0 0x2400000>;
+                       alignment = <0x0 0x400000>;
+                       alloc-ranges = <0x0 0x7dc00000 0x0 0x2400000>;
+               };
+               //don't put other dts in front of fb_reserved
 
                //di_reserved:linux,di {
                //      compatible = "amlogic, di-mem";
@@ -73,14 +83,6 @@
                        size = <0x0 0x2000000>;
                        alignment = <0x0 0x400000>;
                };
-               fb_reserved:linux,meson-fb {
-                       compatible = "shared-dma-pool";
-                       reusable;
-                       size = <0x0 0x2400000>;
-                       alignment = <0x0 0x400000>;
-                       alloc-ranges = <0x0 0x7dc00000 0x0 0x2400000>;
-               };
-
                /*  vdin0 CMA pool */
                //vdin0_cma_reserved:linux,vdin0_cma {
                //      compatible = "shared-dma-pool";

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts
index f87e3b8..8400f65 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts
@@ -64,6 +64,14 @@
                        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>;
+               };
+               //don't put other dts in front of logo_reserved
 
                //di_reserved:linux,di {
                //      compatible = "amlogic, di-mem";
@@ -78,13 +86,6 @@
                        size = <0x0 0x2000000>;
                        alignment = <0x0 0x400000>;
                };
-               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;

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p231_1g.dts b/arch/arm64/boot/dts/amlogic/gxl_p231_1g.dts
index 129451e..dfc010b 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p231_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p231_1g.dts
@@ -64,6 +64,14 @@
                        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 0x3f800000 0x0 0x800000>;
+               };
+               //don't put other dts in front of logo_reserved
 
                //di_reserved:linux,di {
                //      compatible = "amlogic, di-mem";
@@ -78,13 +86,6 @@
                        size = <0x0 0x2000000>;
                        alignment = <0x0 0x400000>;
                };
-               logo_reserved:linux,meson-fb {
-                       compatible = "shared-dma-pool";
-                       reusable;
-                       size = <0x0 0x800000>;
-                       alignment = <0x0 0x400000>;
-                       alloc-ranges = <0x0 0x3f800000 0x0 0x800000>;
-               };
                ion_reserved:linux,ion-dev {
                        compatible = "shared-dma-pool";
                        reusable;

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p231_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_p231_2g.dts
index 467f627..9f5a5f2 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p231_2g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p231_2g.dts
@@ -64,6 +64,14 @@
                        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>;
+               };
+               //don't put other dts in front of logo_reserved
 
                //di_reserved:linux,di {
                //      compatible = "amlogic, di-mem";
@@ -78,13 +86,6 @@
                        size = <0x0 0x2000000>;
                        alignment = <0x0 0x400000>;
                };
-               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;

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 c28fded..32b3604 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p231_2g_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p231_2g_buildroot.dts
@@ -35,7 +35,9 @@
                serial3 = &uart_C;
                serial4 = &uart_AO_B;
        };
-
+       ion_dev {
+               compatible = "amlogic, ion_dev";
+       };
        memory@00000000 {
                device_type = "memory";
                linux,usable-memory = <0x0 0x0100000 0x0 0x7ff00000>;
@@ -59,6 +61,14 @@
                        reg = <0x0 0x05300000 0x0 0x2000000>;
                        no-map;
                };
+               fb_reserved:linux,meson-fb {
+                       compatible = "shared-dma-pool";
+                       reusable;
+                       size = <0x0 0x2400000>;
+                       alignment = <0x0 0x400000>;
+                       alloc-ranges = <0x0 0x7dc00000 0x0 0x2400000>;
+               };
+               //don't put other dts in front of fb_reserved
 
                //di_reserved:linux,di {
                //      compatible = "amlogic, di-mem";
@@ -73,13 +83,7 @@
                        size = <0x0 0x2000000>;
                        alignment = <0x0 0x400000>;
                };
-               fb_reserved:linux,meson-fb {
-                       compatible = "shared-dma-pool";
-                       reusable;
-                       size = <0x0 0x2400000>;
-                       alignment = <0x0 0x400000>;
-                       alloc-ranges = <0x0 0x7dc00000 0x0 0x2400000>;
-               };
+
 
                /*  vdin0 CMA pool */
                //vdin0_cma_reserved:linux,vdin0_cma {

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 85da79f..9bc2c64 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p241_1g_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p241_1g_buildroot.dts
@@ -64,10 +64,13 @@
                        no-map;
                };
                fb_reserved:linux,meson-fb {
-                       compatible = "amlogic, fb-memory";
-                       reg = <0x0 0x3f000000 0x0 0x1000000>;
-                       no-map;
+                       compatible = "shared-dma-pool";
+                       reusable;
+                       size = <0x0 0x1000000>;
+                       alignment = <0x0 0x400000>;
+                       alloc-ranges = <0x0 0x3f000000 0x0 0x1000000>;
                };
+               //don't put other dts in front of fb_reserved
 
                //di_reserved:linux,di {
                //      compatible = "amlogic, di-mem";
@@ -773,14 +776,14 @@
                interrupts = <0 3 1
                        0 89 1>;
                interrupt-names = "viu-vsync", "rdma";
-               mem_size = <0x006AF000 0x00b00000 0x00100000>;
+               mem_size = <0x00300000 0x00b00000 0x00100000>;
                /* uboot logo,fb0/fb1 memory size */
                display_mode_default = "720p60hz";
                scale_mode = <1>;
                /** 0:VPU free scale 1:OSD free scale 2:OSD super scale */
                display_size_default = <1280 720 1280 2160 32>;
                /*1920*1080*4*3 = 0x17BB000*/
-               logo_addr = "0x3fb00000";
+               logo_addr = "0x3f000000";
        };
        ge2d {
                compatible = "amlogic, ge2d";

diff --git a/arch/arm64/boot/dts/amlogic/gxl_skt.dts b/arch/arm64/boot/dts/amlogic/gxl_skt.dts
index 2b27258..5254ffd 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_skt.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_skt.dts
@@ -62,6 +62,14 @@
                        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 0x3f800000 0x0 0x800000>;
+               };
+               //don't put other dts in front of logo_reserved
 
                //di_reserved:linux,di {
                //      compatible = "amlogic, di-mem";
@@ -76,13 +84,7 @@
                        size = <0x0 0x2000000>;
                        alignment = <0x0 0x400000>;
                };
-               logo_reserved:linux,meson-fb {
-                       compatible = "shared-dma-pool";
-                       reusable;
-                       size = <0x0 0x800000>;
-                       alignment = <0x0 0x400000>;
-                       alloc-ranges = <0x0 0x3f800000 0x0 0x800000>;
-               };
+
                ion_reserved:linux,ion-dev {
                        compatible = "shared-dma-pool";
                        reusable;

diff --git a/arch/arm64/boot/dts/amlogic/gxm_q200_2g.dts b/arch/arm64/boot/dts/amlogic/gxm_q200_2g.dts
index 3b21f65..ebb17c0 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxm_q200_2g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxm_q200_2g.dts
@@ -63,6 +63,14 @@
                        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>;
+               };
+               //don't put other dts in front of logo_reserved
 
                //di_reserved:linux,di {
                //      compatible = "amlogic, di-mem";
@@ -77,13 +85,6 @@
                        size = <0x0 0x2000000>;
                        alignment = <0x0 0x400000>;
                };
-               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;

diff --git a/arch/arm64/boot/dts/amlogic/gxm_skt.dts b/arch/arm64/boot/dts/amlogic/gxm_skt.dts
index 3a43f5a..c955ddb 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxm_skt.dts
+++ b/arch/arm64/boot/dts/amlogic/gxm_skt.dts
@@ -63,6 +63,14 @@
                        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 0x3f800000 0x0 0x800000>;
+               };
+               //don't put other dts in front of logo_reserved
 
                //di_reserved:linux,di {
                //      compatible = "amlogic, di-mem";
@@ -77,13 +85,6 @@
                        size = <0x0 0x2000000>;
                        alignment = <0x0 0x400000>;
                };
-               logo_reserved:linux,meson-fb {
-                       compatible = "shared-dma-pool";
-                       reusable;
-                       size = <0x0 0x800000>;
-                       alignment = <0x0 0x400000>;
-                       alloc-ranges = <0x0 0x3f800000 0x0 0x800000>;
-               };
                ion_reserved:linux,ion-dev {
                        compatible = "shared-dma-pool";
                        reusable;