diff options
author | Olof Johansson <olof@lixom.net> | 2015-12-22 12:20:15 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2015-12-22 12:20:15 -0800 |
commit | 8418f73b1931f86c4c96f3a97af0ffbb35f659ed (patch) | |
tree | 3d807eaeb6035785b47a9c9b99287c4d4a4cd775 | |
parent | 4f3ab84156c37ded3423fa108fbcb101c778e86b (diff) | |
parent | 439481026554df8c8909962e956810c6fa93eb23 (diff) | |
download | op-kernel-dev-8418f73b1931f86c4c96f3a97af0ffbb35f659ed.zip op-kernel-dev-8418f73b1931f86c4c96f3a97af0ffbb35f659ed.tar.gz |
Merge tag 'qcom-defconfig-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/defconfig
Qualcomm ARM Based defconfig Updates for v4.5
* Enable newly supported devices on Qualcomm platforms
* Enable HAVE_ARM_ARCH_TIMER
* tag 'qcom-defconfig-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
ARM: defconfig: qcom: Enable SSBI drivers
ARM: defconfig: Update qcom_defconfig
ARM: qcom_defconfig: Enable HAVE_ARM_ARCH_TIMER
Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r-- | arch/arm/configs/qcom_defconfig | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/arch/arm/configs/qcom_defconfig b/arch/arm/configs/qcom_defconfig index ee54a70..7bff7bf 100644 --- a/arch/arm/configs/qcom_defconfig +++ b/arch/arm/configs/qcom_defconfig @@ -1,8 +1,10 @@ CONFIG_SYSVIPC=y +CONFIG_FHANDLE=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y +CONFIG_CGROUPS=y CONFIG_BLK_DEV_INITRD=y CONFIG_SYSCTL_SYSCALL=y CONFIG_KALLSYMS_ALL=y @@ -22,10 +24,10 @@ CONFIG_ARCH_MSM8X60=y CONFIG_ARCH_MSM8960=y CONFIG_ARCH_MSM8974=y CONFIG_SMP=y +CONFIG_HAVE_ARM_ARCH_TIMER=y CONFIG_PREEMPT=y CONFIG_AEABI=y CONFIG_HIGHMEM=y -CONFIG_HIGHPTE=y CONFIG_CLEANCACHE=y CONFIG_ARM_APPENDED_DTB=y CONFIG_ARM_ATAG_DTB_COMPAT=y @@ -78,10 +80,14 @@ CONFIG_USB_USBNET=y # CONFIG_USB_NET_ZAURUS is not set CONFIG_INPUT_EVDEV=y # CONFIG_KEYBOARD_ATKBD is not set +CONFIG_KEYBOARD_GPIO=y +CONFIG_KEYBOARD_PMIC8XXX=y # CONFIG_MOUSE_PS2 is not set CONFIG_INPUT_JOYSTICK=y CONFIG_INPUT_TOUCHSCREEN=y CONFIG_INPUT_MISC=y +CONFIG_INPUT_PM8XXX_VIBRATOR=y +CONFIG_INPUT_PMIC8XXX_PWRKEY=y CONFIG_INPUT_UINPUT=y CONFIG_SERIO_LIBPS2=y # CONFIG_LEGACY_PTYS is not set @@ -99,13 +105,18 @@ CONFIG_PINCTRL_APQ8084=y CONFIG_PINCTRL_IPQ8064=y CONFIG_PINCTRL_MSM8960=y CONFIG_PINCTRL_MSM8X74=y +CONFIG_PINCTRL_QCOM_SPMI_PMIC=y +CONFIG_PINCTRL_QCOM_SSBI_PMIC=y CONFIG_GPIOLIB=y CONFIG_DEBUG_GPIO=y CONFIG_GPIO_SYSFS=y +CONFIG_CHARGER_QCOM_SMBB=y CONFIG_POWER_RESET=y CONFIG_POWER_RESET_MSM=y CONFIG_THERMAL=y +CONFIG_MFD_PM8921_CORE=y CONFIG_MFD_QCOM_RPM=y +CONFIG_MFD_SPMI_PMIC=y CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_QCOM_RPM=y @@ -136,6 +147,7 @@ CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMC_SDHCI_MSM=y CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_PM8XXX=y CONFIG_DMADEVICES=y CONFIG_QCOM_BAM_DMA=y CONFIG_STAGING=y @@ -149,9 +161,9 @@ CONFIG_MSM_MMCC_8974=y CONFIG_HWSPINLOCK_QCOM=y CONFIG_QCOM_GSBI=y CONFIG_QCOM_PM=y +CONFIG_QCOM_SMEM=y CONFIG_QCOM_SMD=y CONFIG_QCOM_SMD_RPM=y -CONFIG_QCOM_SMEM=y CONFIG_PHY_QCOM_APQ8064_SATA=y CONFIG_PHY_QCOM_IPQ806X_SATA=y CONFIG_EXT2_FS=y |