From e87a421efe2aed8af8c45590cf59a8b5c72820a2 Mon Sep 17 00:00:00 2001 From: Xinliang Liu Date: Thu, 29 Oct 2015 17:52:17 +0800 Subject: dts: hi6220: Move cma size configuration to 'reserved-memory' dts node Let configure DMA cma size at dts. Signed-off-by: Xinliang Liu --- arch/arm64/boot/dts/hi6220-hikey.dts | 10 ++++++++++ arch/arm64/configs/defconfig | 1 - 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/hi6220-hikey.dts b/arch/arm64/boot/dts/hi6220-hikey.dts index 2d44f93a69f..1341212373f 100644 --- a/arch/arm64/boot/dts/hi6220-hikey.dts +++ b/arch/arm64/boot/dts/hi6220-hikey.dts @@ -55,6 +55,16 @@ no-map; reg = <0x0 0x06dff000 0x0 0x00001000>; /* Mailbox message buf */ }; + + /* global autoconfigured region for contiguous allocations + * e.g. for graphic usage */ + linux,cma { + compatible = "shared-dma-pool"; + reusable; + size = <0x0 0x8000000>; /* 128M */ + alignment = <0x0 0x2000>; /* 4k page alignment */ + linux,cma-default; + }; }; smb { diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 00b4698f077..94f50738a5f 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -208,7 +208,6 @@ CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y CONFIG_DMA_CMA=y -CONFIG_CMA_SIZE_MBYTES=128 CONFIG_CONNECTOR=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y -- cgit v1.2.3