Skip to content
This repository was archived by the owner on Oct 5, 2018. It is now read-only.

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

Merged
docularxu merged 1 commit into from
Nov 16, 2015
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions arch/arm64/boot/dts/hi6220-hikey.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions arch/arm64/configs/defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down