Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7b00425 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'qcom-arm64-defconfig-for-4.18' of... 

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

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: default avatarOlof Johansson <olof@lixom.net>
parents 41d3ea1f b741377f

arch/arm64/configs/defconfig

+10 −0
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ 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
@@ -193,6 +194,9 @@ CONFIG_BLK_DEV_SD=y 
CONFIG_SCSI_SAS_ATA=y

CONFIG_SCSI_HISI_SAS=y

CONFIG_SCSI_HISI_SAS_PCI=y

CONFIG_SCSI_UFSHCD=m

CONFIG_SCSI_UFSHCD_PLATFORM=m

CONFIG_SCSI_UFS_QCOM=m

CONFIG_ATA=y

CONFIG_SATA_AHCI=y

CONFIG_SATA_AHCI_PLATFORM=y
@@ -212,6 +216,7 @@ CONFIG_VETH=m 
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
@@ -254,6 +259,8 @@ CONFIG_USB_NET_SMSC75XX=m 
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
@@ -578,6 +585,7 @@ CONFIG_TEGRA_IOMMU_SMMU=y 
CONFIG_ARM_SMMU=y

CONFIG_ARM_SMMU_V3=y

CONFIG_QCOM_IOMMU=y

CONFIG_RPMSG_QCOM_GLINK_RPM=y

CONFIG_RPMSG_QCOM_SMD=y

CONFIG_RASPBERRYPI_POWER=y

CONFIG_QCOM_SMEM=y
@@ -589,6 +597,7 @@ CONFIG_ARCH_TEGRA_132_SOC=y 
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
@@ -616,6 +625,7 @@ CONFIG_PHY_HI6220_USB=y 
CONFIG_PHY_QCOM_USB_HS=y

CONFIG_PHY_SUN4I_USB=y

CONFIG_PHY_MVEBU_CP110_COMPHY=y

CONFIG_PHY_QCOM_QMP=m

CONFIG_PHY_ROCKCHIP_INNO_USB2=y

CONFIG_PHY_ROCKCHIP_EMMC=y

CONFIG_PHY_ROCKCHIP_PCIE=m