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

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>

diff --cc arch/arm64/configs/defconfig
index 0565ae5c1b6ae22c633a0e5ca3cba27008ba5e98,d9472e12ab14e1486c86324cce2240235ede1768..b3cfbdfa135a9e4e90bd148c2b3602dd67e60252
--- 1/arch/arm64/configs/defconfig
--- 2/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