diff options
author | Olof Johansson <olof@lixom.net> | 2016-07-05 01:23:23 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2016-07-05 01:23:23 -0400 |
commit | 031bd3a91c6d366a09a9efcc5d8aef4ca2455703 (patch) | |
tree | c2112e7550d642fbb259ebf6472a9e3dae3efca2 | |
parent | e124174e4ce6269fdf6b579ef1ab253454d28877 (diff) | |
parent | f1a176f25aec6a2602040c62e09375596f4dc1a0 (diff) |
Merge tag 'qcom-arm64-defconfig-for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/arm64
Qualcomm ARM64 Based defconfig Updates for v4.8
* Enable PM8xxx pwrkey support
* Enable MSM8996 support
* tag 'qcom-arm64-defconfig-for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
arm64: defconfig: enable msm8996 pinctrl support
arm64: defconfig: Enable qcom msm8996 clk drivers
arm: defconfig: Enable PM8941 pwr key
Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r-- | arch/arm64/configs/defconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index e8a99eede12f..d0a735943e0c 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig | |||
@@ -147,6 +147,8 @@ CONFIG_WL18XX=m | |||
147 | CONFIG_WLCORE_SDIO=m | 147 | CONFIG_WLCORE_SDIO=m |
148 | CONFIG_INPUT_EVDEV=y | 148 | CONFIG_INPUT_EVDEV=y |
149 | CONFIG_KEYBOARD_GPIO=y | 149 | CONFIG_KEYBOARD_GPIO=y |
150 | CONFIG_INPUT_MISC=y | ||
151 | CONFIG_INPUT_PM8941_PWRKEY=y | ||
150 | # CONFIG_SERIO_SERPORT is not set | 152 | # CONFIG_SERIO_SERPORT is not set |
151 | CONFIG_SERIO_AMBAKMI=y | 153 | CONFIG_SERIO_AMBAKMI=y |
152 | CONFIG_LEGACY_PTY_COUNT=16 | 154 | CONFIG_LEGACY_PTY_COUNT=16 |
@@ -191,6 +193,7 @@ CONFIG_SPI_SPIDEV=m | |||
191 | CONFIG_SPMI=y | 193 | CONFIG_SPMI=y |
192 | CONFIG_PINCTRL_SINGLE=y | 194 | CONFIG_PINCTRL_SINGLE=y |
193 | CONFIG_PINCTRL_MSM8916=y | 195 | CONFIG_PINCTRL_MSM8916=y |
196 | CONFIG_PINCTRL_MSM8996=y | ||
194 | CONFIG_PINCTRL_QCOM_SPMI_PMIC=y | 197 | CONFIG_PINCTRL_QCOM_SPMI_PMIC=y |
195 | CONFIG_GPIO_SYSFS=y | 198 | CONFIG_GPIO_SYSFS=y |
196 | CONFIG_GPIO_DWAPB=y | 199 | CONFIG_GPIO_DWAPB=y |
@@ -291,6 +294,7 @@ CONFIG_COMMON_CLK_CS2000_CP=y | |||
291 | CONFIG_CLK_QORIQ=y | 294 | CONFIG_CLK_QORIQ=y |
292 | CONFIG_COMMON_CLK_QCOM=y | 295 | CONFIG_COMMON_CLK_QCOM=y |
293 | CONFIG_MSM_GCC_8916=y | 296 | CONFIG_MSM_GCC_8916=y |
297 | CONFIG_MSM_MMCC_8996=y | ||
294 | CONFIG_HWSPINLOCK_QCOM=y | 298 | CONFIG_HWSPINLOCK_QCOM=y |
295 | CONFIG_MAILBOX=y | 299 | CONFIG_MAILBOX=y |
296 | CONFIG_ARM_MHU=y | 300 | CONFIG_ARM_MHU=y |