diff options
author | Vishal Bhoj <vishal.bhoj@linaro.org> | 2015-11-23 11:35:31 +0000 |
---|---|---|
committer | Vishal Bhoj <vishal.bhoj@linaro.org> | 2015-11-23 11:35:35 +0000 |
commit | 2bdb9463873bb911a48e1c376e4cad73e677b4cf (patch) | |
tree | a1c45a7284bae5947d32e29a217217a2eeefabfb | |
parent | 94564714a749765fb6f94c603fafde67d9499534 (diff) |
ARM64: defconfig: Pull hikey changes from defconfigandroid-3.18
Increase CMA size to 128MB
enable HISI_POWERKEY driver
Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
-rw-r--r-- | arch/arm64/configs/hikey_defconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm64/configs/hikey_defconfig b/arch/arm64/configs/hikey_defconfig index 0372397dd4b..64f9c3b0c5d 100644 --- a/arch/arm64/configs/hikey_defconfig +++ b/arch/arm64/configs/hikey_defconfig @@ -200,7 +200,7 @@ CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y CONFIG_DMA_CMA=y -CONFIG_CMA_SIZE_MBYTES=64 +CONFIG_CMA_SIZE_MBYTES=128 CONFIG_CONNECTOR=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y @@ -252,6 +252,7 @@ CONFIG_INPUT_EVDEV=y CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=y CONFIG_INPUT_GPIO=y +CONFIG_HISI_POWERKEY=y # CONFIG_SERIO_SERPORT is not set CONFIG_SERIO_AMBAKMI=y CONFIG_DEVPTS_MULTIPLE_INSTANCES=y |