Merge pull request #151 from xin3liang/hikey-test

Revert "dts: hi6220: Move cma size configuration to 'reserved-memory'

Author: Guodong Xu

arch/arm64/boot/dts/hi6220-hikey.dts

@@ -56,16 +56,6 @@
 			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 {

arch/arm64/configs/defconfig

@@ -208,6 +208,7 @@ 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