diff options
| author | Olof Johansson <olof@lixom.net> | 2016-07-04 22:22:01 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-07-04 22:22:01 -0700 |
| commit | a963e0924017a37c6dc41a79e5ff9f549de3f42c (patch) | |
| tree | ccef543fb49a902d8d32bd8053fbc37d823b0fc8 /arch/arm/configs | |
| parent | 59f23b6e428bf0a17d55f96df32e71652b597131 (diff) | |
| parent | 8aa788d3e59a14845c95446ac25a267e75711374 (diff) | |
| download | linux-next-a963e0924017a37c6dc41a79e5ff9f549de3f42c.tar.gz | |
Merge tag 'qcom-defconfig-for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/defconfig
Qualcomm ARM Based defconfig Updates for v4.8
* Enable MSM9615 board support
* Enable MSM8660 pinctrl support
* tag 'qcom-defconfig-for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
ARM: configs: qualcomm: Add MDM9615 missing defconfigs
ARM: defconfig: enable the MSM8660 pin controller
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/qcom_defconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/configs/qcom_defconfig b/arch/arm/configs/qcom_defconfig index 7bff7bf24a85..c2dff4fd5fc4 100644 --- a/arch/arm/configs/qcom_defconfig +++ b/arch/arm/configs/qcom_defconfig @@ -23,6 +23,7 @@ CONFIG_ARCH_QCOM=y CONFIG_ARCH_MSM8X60=y CONFIG_ARCH_MSM8960=y CONFIG_ARCH_MSM8974=y +CONFIG_ARCH_MDM9615=y CONFIG_SMP=y CONFIG_HAVE_ARM_ARCH_TIMER=y CONFIG_PREEMPT=y @@ -94,6 +95,7 @@ CONFIG_SERIO_LIBPS2=y CONFIG_SERIAL_MSM=y CONFIG_SERIAL_MSM_CONSOLE=y CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM_MSM=y CONFIG_I2C=y CONFIG_I2C_CHARDEV=y CONFIG_I2C_QUP=y @@ -103,7 +105,9 @@ CONFIG_SPMI=y CONFIG_PINCTRL_APQ8064=y CONFIG_PINCTRL_APQ8084=y CONFIG_PINCTRL_IPQ8064=y +CONFIG_PINCTRL_MSM8660=y CONFIG_PINCTRL_MSM8960=y +CONFIG_PINCTRL_MDM9615=y CONFIG_PINCTRL_MSM8X74=y CONFIG_PINCTRL_QCOM_SPMI_PMIC=y CONFIG_PINCTRL_QCOM_SSBI_PMIC=y @@ -114,6 +118,7 @@ CONFIG_CHARGER_QCOM_SMBB=y CONFIG_POWER_RESET=y CONFIG_POWER_RESET_MSM=y CONFIG_THERMAL=y +CONFIG_MFD_PM8XXX=y CONFIG_MFD_PM8921_CORE=y CONFIG_MFD_QCOM_RPM=y CONFIG_MFD_SPMI_PMIC=y @@ -143,6 +148,7 @@ CONFIG_USB_GADGET_VBUS_DRAW=500 CONFIG_MMC=y CONFIG_MMC_BLOCK_MINORS=32 CONFIG_MMC_ARMMMCI=y +CONFIG_MMC_QCOM_DML=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMC_SDHCI_MSM=y @@ -156,6 +162,8 @@ CONFIG_APQ_MMCC_8084=y CONFIG_IPQ_LCC_806X=y CONFIG_MSM_GCC_8660=y CONFIG_MSM_LCC_8960=y +CONFIG_MSM_GCC_9615=y +CONFIG_MSM_LCC_9615=y CONFIG_MSM_MMCC_8960=y CONFIG_MSM_MMCC_8974=y CONFIG_HWSPINLOCK_QCOM=y |