diff options
| author | Xinliang Liu <xinliang.liu@linaro.org> | 2015-10-29 17:52:17 +0800 |
|---|---|---|
| committer | Vishal Bhoj <vishal.bhoj@linaro.org> | 2015-11-23 04:25:40 +0000 |
| commit | e87a421efe2aed8af8c45590cf59a8b5c72820a2 (patch) | |
| tree | 7fbc004ed84d6c1c87ed12f6a4c7830d461fcb7d | |
| parent | 88b9fb80cf980ea6880f2679c603b2220731dd3f (diff) | |
dts: hi6220: Move cma size configuration to 'reserved-memory' dts node
Let configure DMA cma size at dts.
Signed-off-by: Xinliang Liu <xinliang.liu@linaro.org>
| -rw-r--r-- | arch/arm64/boot/dts/hi6220-hikey.dts | 10 | ||||
| -rw-r--r-- | arch/arm64/configs/defconfig | 1 |
2 files changed, 10 insertions, 1 deletions
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 |