Merge tag 'qcom-arm64-defconfig-for-4.18' of git://git.kernel.org/pub/scm/linux/kerne...

Qualcomm ARM64 Based defconfig Updates for v4.18

* Enable UFS and PCIe for Qualcomm msm8996/db820c

* tag 'qcom-arm64-defconfig-for-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
  arm64: defconfig: Enable PCIe on msm8996 and db820c
  arm64: defconfig: Enable UFS on msm8996

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

diff --cc arch/arm64/configs/defconfig
index b3cfbdfa135a9e4e90bd148c2b3602dd67e60252,301b5f694abb4d4c9b0b7fe84676fa75366cde6f..b209f9511ad04ad466f7d0af5adb782581b803a1
--- 1/arch/arm64/configs/defconfig
--- 2/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -173,8 -169,7 +173,9 @@@ 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_SIMPLE_PM_BUS=y
  CONFIG_MTD=y
  CONFIG_MTD_BLOCK=y
  CONFIG_MTD_M25P80=y
@@@ -212,9 -210,9 +216,10 @@@ CONFIG_VETH=
  CONFIG_VIRTIO_NET=y
  CONFIG_AMD_XGBE=y
  CONFIG_NET_XGENE=y
+ CONFIG_ATL1C=m
  CONFIG_MACB=y
  CONFIG_THUNDER_NIC_PF=y
 +CONFIG_HIX5HD2_GMAC=y
  CONFIG_HNS_DSAF=y
  CONFIG_HNS_ENET=y
  CONFIG_E1000E=y
@@@ -254,9 -251,9 +259,11 @@@ CONFIG_USB_NET_SMSC75XX=
  CONFIG_USB_NET_SMSC95XX=m
  CONFIG_USB_NET_PLUSB=m
  CONFIG_USB_NET_MCS7830=m
+ CONFIG_ATH10K=m
+ CONFIG_ATH10K_PCI=m
  CONFIG_BRCMFMAC=m
 +CONFIG_MWIFIEX=m
 +CONFIG_MWIFIEX_PCIE=m
  CONFIG_WL18XX=m
  CONFIG_WLCORE_SDIO=m
  CONFIG_INPUT_EVDEV=y
@@@ -589,8 -575,8 +597,9 @@@ CONFIG_ARCH_TEGRA_132_SOC=
  CONFIG_ARCH_TEGRA_210_SOC=y
  CONFIG_ARCH_TEGRA_186_SOC=y
  CONFIG_ARCH_TEGRA_194_SOC=y
+ CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
  CONFIG_EXTCON_USB_GPIO=y
 +CONFIG_EXTCON_USBC_CROS_EC=y
  CONFIG_MEMORY=y
  CONFIG_TEGRA_MC=y
  CONFIG_IIO=y