diff --git a/arch/arm/boot/dts/amlogic/sm1_pxp.dts b/arch/arm/boot/dts/amlogic/sm1_pxp.dts index 6d4a493792f8..a6df1e21905f 100644 --- a/arch/arm/boot/dts/amlogic/sm1_pxp.dts +++ b/arch/arm/boot/dts/amlogic/sm1_pxp.dts @@ -69,7 +69,7 @@ ion_cma_reserved:linux,ion-dev { compatible = "shared-dma-pool"; reusable; - size = <0x8000000>; + size = <0x3000000>; alignment = <0x400000>; }; @@ -120,13 +120,13 @@ //no-map; }; /* vdin0 CMA pool */ - vdin0_cma_reserved:linux,vdin0_cma { - compatible = "shared-dma-pool"; - reusable; + //vdin0_cma_reserved:linux,vdin0_cma { + // compatible = "shared-dma-pool"; + // reusable; /* 1920x1080x2x4 =16+4 M */ - size = <0x04000000>; - alignment = <0x400000>; - }; + // size = <0x04000000>; + // alignment = <0x400000>; + //}; /* vdin1 CMA pool */ vdin1_cma_reserved:linux,vdin1_cma { compatible = "shared-dma-pool"; @@ -713,7 +713,7 @@ /*if you want to use vdin just modify status to "ok"*/ &vdin0 { - memory-region = <&vdin0_cma_reserved>; + /*memory-region = <&vdin0_cma_reserved>;*/ status = "okay"; /*vdin write mem color depth support: *bit0:support 8bit diff --git a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts index dc51174a07e1..6a22bd04c840 100644 --- a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts +++ b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts @@ -136,13 +136,13 @@ //no-map; }; /* vdin0 CMA pool */ - vdin0_cma_reserved:linux,vdin0_cma { - compatible = "shared-dma-pool"; - reusable; + //vdin0_cma_reserved:linux,vdin0_cma { + // compatible = "shared-dma-pool"; + // reusable; /* 1920x1080x2x4 =16+4 M */ - size = <0x04000000>; - alignment = <0x400000>; - }; + // size = <0x04000000>; + // alignment = <0x400000>; + //}; /* vdin1 CMA pool */ vdin1_cma_reserved:linux,vdin1_cma { compatible = "shared-dma-pool"; @@ -1696,7 +1696,7 @@ /*if you want to use vdin just modify status to "ok"*/ &vdin0 { - memory-region = <&vdin0_cma_reserved>; + /*memory-region = <&vdin0_cma_reserved>;*/ status = "okay"; /*vdin write mem color depth support: *bit0:support 8bit diff --git a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts index 2439c802845f..e68d64732110 100644 --- a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts +++ b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts @@ -136,13 +136,13 @@ //no-map; }; /* vdin0 CMA pool */ - vdin0_cma_reserved:linux,vdin0_cma { - compatible = "shared-dma-pool"; - reusable; + //vdin0_cma_reserved:linux,vdin0_cma { + // compatible = "shared-dma-pool"; + // reusable; /* 1920x1080x2x4 =16+4 M */ - size = <0x04000000>; - alignment = <0x400000>; - }; + // size = <0x04000000>; + // alignment = <0x400000>; + //}; /* vdin1 CMA pool */ vdin1_cma_reserved:linux,vdin1_cma { compatible = "shared-dma-pool"; @@ -1713,7 +1713,7 @@ /*if you want to use vdin just modify status to "ok"*/ &vdin0 { - memory-region = <&vdin0_cma_reserved>; + /*memory-region = <&vdin0_cma_reserved>;*/ status = "okay"; /*vdin write mem color depth support: *bit0:support 8bit diff --git a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts index 15f868795d8e..18e15e5b8334 100644 --- a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts +++ b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts @@ -85,7 +85,7 @@ ion_cma_reserved:linux,ion-dev { compatible = "shared-dma-pool"; reusable; - size = <0x8000000>; + size = <0x3000000>; alignment = <0x400000>; alloc-ranges = <0x0 0x30000000>; }; @@ -136,13 +136,13 @@ //no-map; }; /* vdin0 CMA pool */ - vdin0_cma_reserved:linux,vdin0_cma { - compatible = "shared-dma-pool"; - reusable; + //vdin0_cma_reserved:linux,vdin0_cma { + // compatible = "shared-dma-pool"; + // reusable; /* 1920x1080x2x4 =16+4 M */ - size = <0x04000000>; - alignment = <0x400000>; - }; + // size = <0x04000000>; + // alignment = <0x400000>; + //}; /* vdin1 CMA pool */ vdin1_cma_reserved:linux,vdin1_cma { compatible = "shared-dma-pool"; @@ -1713,7 +1713,7 @@ /*if you want to use vdin just modify status to "ok"*/ &vdin0 { - memory-region = <&vdin0_cma_reserved>; + /*memory-region = <&vdin0_cma_reserved>;*/ status = "okay"; /*vdin write mem color depth support: *bit0:support 8bit diff --git a/arch/arm/boot/dts/amlogic/sm1_s905d3_skt.dts b/arch/arm/boot/dts/amlogic/sm1_s905d3_skt.dts index 10dcf865418c..939fbc090aa5 100644 --- a/arch/arm/boot/dts/amlogic/sm1_s905d3_skt.dts +++ b/arch/arm/boot/dts/amlogic/sm1_s905d3_skt.dts @@ -136,13 +136,13 @@ //no-map; }; /* vdin0 CMA pool */ - vdin0_cma_reserved:linux,vdin0_cma { - compatible = "shared-dma-pool"; - reusable; + //vdin0_cma_reserved:linux,vdin0_cma { + // compatible = "shared-dma-pool"; + // reusable; /* 1920x1080x2x4 =16+4 M */ - size = <0x04000000>; - alignment = <0x400000>; - }; + // size = <0x04000000>; + // alignment = <0x400000>; + //}; /* vdin1 CMA pool */ vdin1_cma_reserved:linux,vdin1_cma { compatible = "shared-dma-pool"; @@ -1690,7 +1690,7 @@ /*if you want to use vdin just modify status to "ok"*/ &vdin0 { - memory-region = <&vdin0_cma_reserved>; + /*memory-region = <&vdin0_cma_reserved>;*/ status = "okay"; /*vdin write mem color depth support: *bit0:support 8bit diff --git a/arch/arm/boot/dts/amlogic/sm1_s905x3_ac213.dts b/arch/arm/boot/dts/amlogic/sm1_s905x3_ac213.dts index 965e2070cc25..8d8c46774684 100644 --- a/arch/arm/boot/dts/amlogic/sm1_s905x3_ac213.dts +++ b/arch/arm/boot/dts/amlogic/sm1_s905x3_ac213.dts @@ -136,13 +136,13 @@ //no-map; }; /* vdin0 CMA pool */ - vdin0_cma_reserved:linux,vdin0_cma { - compatible = "shared-dma-pool"; - reusable; + //vdin0_cma_reserved:linux,vdin0_cma { + // compatible = "shared-dma-pool"; + // reusable; /* 1920x1080x2x4 =16+4 M */ - size = <0x04000000>; - alignment = <0x400000>; - }; + // size = <0x04000000>; + // alignment = <0x400000>; + //}; /* vdin1 CMA pool */ vdin1_cma_reserved:linux,vdin1_cma { compatible = "shared-dma-pool"; @@ -1621,7 +1621,7 @@ /*if you want to use vdin just modify status to "ok"*/ &vdin0 { - memory-region = <&vdin0_cma_reserved>; + /*memory-region = <&vdin0_cma_reserved>;*/ status = "okay"; /*vdin write mem color depth support: *bit0:support 8bit diff --git a/arch/arm64/boot/dts/amlogic/sm1_pxp.dts b/arch/arm64/boot/dts/amlogic/sm1_pxp.dts index 7be2bbd10f10..77b6dd4e31d7 100644 --- a/arch/arm64/boot/dts/amlogic/sm1_pxp.dts +++ b/arch/arm64/boot/dts/amlogic/sm1_pxp.dts @@ -70,7 +70,7 @@ ion_cma_reserved:linux,ion-dev { compatible = "shared-dma-pool"; reusable; - size = <0x0 0x8000000>; + size = <0x0 0x3000000>; alignment = <0x0 0x400000>; }; @@ -121,13 +121,13 @@ //no-map; }; /* vdin0 CMA pool */ - vdin0_cma_reserved:linux,vdin0_cma { - compatible = "shared-dma-pool"; - reusable; + //vdin0_cma_reserved:linux,vdin0_cma { + // compatible = "shared-dma-pool"; + // reusable; /* 1920x1080x2x4 =16+4 M */ - size = <0x0 0x04000000>; - alignment = <0x0 0x400000>; - }; + // size = <0x0 0x04000000>; + // alignment = <0x0 0x400000>; + //}; /* vdin1 CMA pool */ vdin1_cma_reserved:linux,vdin1_cma { compatible = "shared-dma-pool"; @@ -715,7 +715,7 @@ /*if you want to use vdin just modify status to "ok"*/ &vdin0 { - memory-region = <&vdin0_cma_reserved>; + /*memory-region = <&vdin0_cma_reserved>;*/ status = "okay"; /*vdin write mem color depth support: *bit0:support 8bit diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts index 4c50052ff330..309ed59a7f4d 100644 --- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts +++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts @@ -134,13 +134,13 @@ //no-map; }; /* vdin0 CMA pool */ - vdin0_cma_reserved:linux,vdin0_cma { - compatible = "shared-dma-pool"; - reusable; + //vdin0_cma_reserved:linux,vdin0_cma { + // compatible = "shared-dma-pool"; + // reusable; /* 1920x1080x2x4 =16+4 M */ - size = <0x0 0x04000000>; - alignment = <0x0 0x400000>; - }; + // size = <0x0 0x04000000>; + // alignment = <0x0 0x400000>; + //}; /* vdin1 CMA pool */ vdin1_cma_reserved:linux,vdin1_cma { compatible = "shared-dma-pool"; @@ -1679,7 +1679,7 @@ /*if you want to use vdin just modify status to "ok"*/ &vdin0 { - memory-region = <&vdin0_cma_reserved>; + /*memory-region = <&vdin0_cma_reserved>;*/ status = "okay"; /*vdin write mem color depth support: *bit0:support 8bit diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts index 046627c3c0f6..d92fa50b15be 100644 --- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts +++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts @@ -134,13 +134,13 @@ //no-map; }; /* vdin0 CMA pool */ - vdin0_cma_reserved:linux,vdin0_cma { - compatible = "shared-dma-pool"; - reusable; + //vdin0_cma_reserved:linux,vdin0_cma { + // compatible = "shared-dma-pool"; + // reusable; /* 1920x1080x2x4 =16+4 M */ - size = <0x0 0x04000000>; - alignment = <0x0 0x400000>; - }; + // size = <0x0 0x04000000>; + // alignment = <0x0 0x400000>; + //}; /* vdin1 CMA pool */ vdin1_cma_reserved:linux,vdin1_cma { compatible = "shared-dma-pool"; @@ -1711,7 +1711,7 @@ /*if you want to use vdin just modify status to "ok"*/ &vdin0 { - memory-region = <&vdin0_cma_reserved>; + /*memory-region = <&vdin0_cma_reserved>;*/ status = "okay"; /*vdin write mem color depth support: *bit0:support 8bit diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts index 2ff004bdd30b..02ffc9d49f57 100644 --- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts +++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts @@ -85,7 +85,7 @@ ion_cma_reserved:linux,ion-dev { compatible = "shared-dma-pool"; reusable; - size = <0x0 0x8000000>; + size = <0x0 0x3000000>; alignment = <0x0 0x400000>; }; //di_reserved:linux,di { @@ -134,13 +134,13 @@ //no-map; }; /* vdin0 CMA pool */ - vdin0_cma_reserved:linux,vdin0_cma { - compatible = "shared-dma-pool"; - reusable; + //vdin0_cma_reserved:linux,vdin0_cma { + // compatible = "shared-dma-pool"; + // reusable; /* 1920x1080x2x4 =16+4 M */ - size = <0x0 0x04000000>; - alignment = <0x0 0x400000>; - }; + // size = <0x0 0x04000000>; + // alignment = <0x0 0x400000>; + //}; /* vdin1 CMA pool */ vdin1_cma_reserved:linux,vdin1_cma { compatible = "shared-dma-pool"; @@ -1712,7 +1712,7 @@ /*if you want to use vdin just modify status to "ok"*/ &vdin0 { - memory-region = <&vdin0_cma_reserved>; + /*memory-region = <&vdin0_cma_reserved>;*/ status = "okay"; /*vdin write mem color depth support: *bit0:support 8bit diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905d3_skt.dts b/arch/arm64/boot/dts/amlogic/sm1_s905d3_skt.dts index ec39bba7b040..85ea0f809e1d 100644 --- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_skt.dts +++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_skt.dts @@ -134,13 +134,13 @@ //no-map; }; /* vdin0 CMA pool */ - vdin0_cma_reserved:linux,vdin0_cma { - compatible = "shared-dma-pool"; - reusable; + //vdin0_cma_reserved:linux,vdin0_cma { + // compatible = "shared-dma-pool"; + // reusable; /* 1920x1080x2x4 =16+4 M */ - size = <0x0 0x04000000>; - alignment = <0x0 0x400000>; - }; + // size = <0x0 0x04000000>; + // alignment = <0x0 0x400000>; + //}; /* vdin1 CMA pool */ vdin1_cma_reserved:linux,vdin1_cma { compatible = "shared-dma-pool"; @@ -1688,7 +1688,7 @@ /*if you want to use vdin just modify status to "ok"*/ &vdin0 { - memory-region = <&vdin0_cma_reserved>; + /*memory-region = <&vdin0_cma_reserved>;*/ status = "okay"; /*vdin write mem color depth support: *bit0:support 8bit diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213.dts b/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213.dts index 1bdc6e818a44..93bdaa560877 100644 --- a/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213.dts +++ b/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213.dts @@ -134,13 +134,13 @@ //no-map; }; /* vdin0 CMA pool */ - vdin0_cma_reserved:linux,vdin0_cma { - compatible = "shared-dma-pool"; - reusable; + //vdin0_cma_reserved:linux,vdin0_cma { + // compatible = "shared-dma-pool"; + // reusable; /* 1920x1080x2x4 =16+4 M */ - size = <0x0 0x04000000>; - alignment = <0x0 0x400000>; - }; + // size = <0x0 0x04000000>; + // alignment = <0x0 0x400000>; + //}; /* vdin1 CMA pool */ vdin1_cma_reserved:linux,vdin1_cma { compatible = "shared-dma-pool"; @@ -1697,7 +1697,7 @@ /*if you want to use vdin just modify status to "ok"*/ &vdin0 { - memory-region = <&vdin0_cma_reserved>; + /*memory-region = <&vdin0_cma_reserved>;*/ status = "okay"; /*vdin write mem color depth support: *bit0:support 8bit