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

Commit 23d4635e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Pull "Qualcomm ARM64 Based defconfig Updates for v4.9" from Andy Gross:

* Enable defconfig options for QDF2432

* tag 'qcom-arm64-defconfig-for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
  arm64: defconfig: Enable QDF2432 config options
parents 699189c8 d11a544e

arch/arm64/configs/defconfig

+4 −0
Original line number Diff line number Diff line
@@ -247,6 +247,7 @@ CONFIG_PINCTRL_SINGLE=y 
CONFIG_PINCTRL_MAX77620=y

CONFIG_PINCTRL_MSM8916=y

CONFIG_PINCTRL_MSM8996=y

CONFIG_PINCTRL_QDF2XXX=y

CONFIG_PINCTRL_QCOM_SPMI_PMIC=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_DWAPB=y
@@ -332,6 +333,7 @@ CONFIG_MMC=y 
CONFIG_MMC_BLOCK_MINORS=32

CONFIG_MMC_ARMMMCI=y

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_ACPI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_OF_ESDHC=y

CONFIG_MMC_SDHCI_TEGRA=y
@@ -362,6 +364,8 @@ CONFIG_DMADEVICES=y 
CONFIG_PL330_DMA=y

CONFIG_TEGRA20_APB_DMA=y

CONFIG_QCOM_BAM_DMA=y

CONFIG_QCOM_HIDMA_MGMT=y

CONFIG_QCOM_HIDMA=y

CONFIG_RCAR_DMAC=y

CONFIG_VFIO=y

CONFIG_VFIO_PCI=y