From: Olof Johansson <olof@lixom.net>
Date: Fri, 25 May 2018 22:27:48 +0000 (-0700)
Subject: Merge tag 'hisi-defconfig-for-4.18v3' of git://github.com/hisilicon/linux-hisi into... 
X-Git-Tag: v4.19~809^2^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=41d3ea1fb46132b41a9de6a773380f483d09d396;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'hisi-defconfig-for-4.18v3' of git://github.com/hisilicon/linux-hisi into next/defconfig

ARM64: hisilicon: defconfig updates for 4.18

- Enable the support of ethernet, eMMC, Combo/INNO phy
  and PCIe for Hi3798CV200
- Enable the LPC for hip06 and hip07

* tag 'hisi-defconfig-for-4.18v3' of git://github.com/hisilicon/linux-hisi:
  arm64: defconfig: Enable HISILICON_LPC
  arm64: defconfig: enable drivers for Poplar support

Signed-off-by: Olof Johansson <olof@lixom.net>
---

41d3ea1fb46132b41a9de6a773380f483d09d396
diff --cc arch/arm64/configs/defconfig
index 0565ae5,d9472e1..b3cfbdf
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -172,7 -170,7 +173,8 @@@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplu
  CONFIG_DEVTMPFS=y
  CONFIG_DEVTMPFS_MOUNT=y
  CONFIG_DMA_CMA=y
 +CONFIG_CMA_SIZE_MBYTES=32
+ CONFIG_HISILICON_LPC=y
  CONFIG_MTD=y
  CONFIG_MTD_BLOCK=y
  CONFIG_MTD_M25P80=y