From 882c510212185577ca4554793c2d8e70505ae4e8 Mon Sep 17 00:00:00 2001 From: Nanxin Qin Date: Sun, 7 May 2017 23:31:35 +0800 Subject: [PATCH] dts: gxl/gxm: give up the reserved memory in the media drivers PD#143278: the memory allocation through the CMA Change-Id: Ife7c9ebb02ae71aea19c2d0fb8180e2df9f96e0d Signed-off-by: Nanxin Qin --- arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts | 4 ++-- arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts | 4 ++-- arch/arm64/boot/dts/amlogic/gxl_skt.dts | 4 ++-- arch/arm64/boot/dts/amlogic/gxm_q200_2g.dts | 4 ++-- arch/arm64/boot/dts/amlogic/gxm_skt.dts | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts b/arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts index 970f2fd72ee9..2ec74081e863 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts @@ -118,7 +118,7 @@ codec_mm_cma:linux,codec_mm_cma { compatible = "shared-dma-pool"; reusable; - size = <0x0 0xc000000>; + size = <0x0 0x10400000>; alignment = <0x0 0x400000>; linux,contiguous-region; }; @@ -132,7 +132,7 @@ /* codec shared reserved */ codec_mm_reserved:linux,codec_mm_reserved { compatible = "amlogic, codec-mm-reserved"; - size = <0x0 0x4100000>; + size = <0x0 0x0>; alignment = <0x0 0x100000>; //no-map; }; diff --git a/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts index e5e7ee3274a3..e7eeb11cd9b3 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts @@ -119,7 +119,7 @@ codec_mm_cma:linux,codec_mm_cma { compatible = "shared-dma-pool"; reusable; - size = <0x0 0xc000000>; + size = <0x0 0x10400000>; alignment = <0x0 0x400000>; linux,contiguous-region; }; @@ -133,7 +133,7 @@ /* codec shared reserved */ codec_mm_reserved:linux,codec_mm_reserved { compatible = "amlogic, codec-mm-reserved"; - size = <0x0 0x4100000>; + size = <0x0 0x0>; alignment = <0x0 0x100000>; //no-map; }; diff --git a/arch/arm64/boot/dts/amlogic/gxl_skt.dts b/arch/arm64/boot/dts/amlogic/gxl_skt.dts index 8de487e87bff..acab2abc0628 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_skt.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_skt.dts @@ -118,7 +118,7 @@ codec_mm_cma:linux,codec_mm_cma { compatible = "shared-dma-pool"; reusable; - size = <0x0 0xc000000>; + size = <0x0 0x10400000>; alignment = <0x0 0x400000>; linux,contiguous-region; }; @@ -132,7 +132,7 @@ /* codec shared reserved */ codec_mm_reserved:linux,codec_mm_reserved { compatible = "amlogic, codec-mm-reserved"; - size = <0x0 0x4100000>; + size = <0x0 0x0>; alignment = <0x0 0x100000>; //no-map; }; diff --git a/arch/arm64/boot/dts/amlogic/gxm_q200_2g.dts b/arch/arm64/boot/dts/amlogic/gxm_q200_2g.dts index d05cfb9b4f40..962a76696803 100644 --- a/arch/arm64/boot/dts/amlogic/gxm_q200_2g.dts +++ b/arch/arm64/boot/dts/amlogic/gxm_q200_2g.dts @@ -118,7 +118,7 @@ codec_mm_cma:linux,codec_mm_cma { compatible = "shared-dma-pool"; reusable; - size = <0x0 0xd000000>; + size = <0x0 0x11400000>; alignment = <0x0 0x400000>; linux,contiguous-region; }; @@ -132,7 +132,7 @@ /* codec shared reserved */ codec_mm_reserved:linux,codec_mm_reserved { compatible = "amlogic, codec-mm-reserved"; - size = <0x0 0x4100000>; + size = <0x0 0x0>; alignment = <0x0 0x100000>; //no-map; }; diff --git a/arch/arm64/boot/dts/amlogic/gxm_skt.dts b/arch/arm64/boot/dts/amlogic/gxm_skt.dts index 270b66df08ca..fbdc7b4ccc40 100644 --- a/arch/arm64/boot/dts/amlogic/gxm_skt.dts +++ b/arch/arm64/boot/dts/amlogic/gxm_skt.dts @@ -119,7 +119,7 @@ codec_mm_cma:linux,codec_mm_cma { compatible = "shared-dma-pool"; reusable; - size = <0x0 0xc000000>; + size = <0x0 0x10400000>; alignment = <0x0 0x400000>; linux,contiguous-region; }; @@ -133,7 +133,7 @@ /* codec shared reserved */ codec_mm_reserved:linux,codec_mm_reserved { compatible = "amlogic, codec-mm-reserved"; - size = <0x0 0x4100000>; + size = <0x0 0x0>; alignment = <0x0 0x100000>; //no-map; };