aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2016-07-05 01:23:23 -0400
committerOlof Johansson <olof@lixom.net>2016-07-05 01:23:23 -0400
commit031bd3a91c6d366a09a9efcc5d8aef4ca2455703 (patch)
treec2112e7550d642fbb259ebf6472a9e3dae3efca2
parente124174e4ce6269fdf6b579ef1ab253454d28877 (diff)
parentf1a176f25aec6a2602040c62e09375596f4dc1a0 (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/defconfig4
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
147CONFIG_WLCORE_SDIO=m 147CONFIG_WLCORE_SDIO=m
148CONFIG_INPUT_EVDEV=y 148CONFIG_INPUT_EVDEV=y
149CONFIG_KEYBOARD_GPIO=y 149CONFIG_KEYBOARD_GPIO=y
150CONFIG_INPUT_MISC=y
151CONFIG_INPUT_PM8941_PWRKEY=y
150# CONFIG_SERIO_SERPORT is not set 152# CONFIG_SERIO_SERPORT is not set
151CONFIG_SERIO_AMBAKMI=y 153CONFIG_SERIO_AMBAKMI=y
152CONFIG_LEGACY_PTY_COUNT=16 154CONFIG_LEGACY_PTY_COUNT=16
@@ -191,6 +193,7 @@ CONFIG_SPI_SPIDEV=m
191CONFIG_SPMI=y 193CONFIG_SPMI=y
192CONFIG_PINCTRL_SINGLE=y 194CONFIG_PINCTRL_SINGLE=y
193CONFIG_PINCTRL_MSM8916=y 195CONFIG_PINCTRL_MSM8916=y
196CONFIG_PINCTRL_MSM8996=y
194CONFIG_PINCTRL_QCOM_SPMI_PMIC=y 197CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
195CONFIG_GPIO_SYSFS=y 198CONFIG_GPIO_SYSFS=y
196CONFIG_GPIO_DWAPB=y 199CONFIG_GPIO_DWAPB=y
@@ -291,6 +294,7 @@ CONFIG_COMMON_CLK_CS2000_CP=y
291CONFIG_CLK_QORIQ=y 294CONFIG_CLK_QORIQ=y
292CONFIG_COMMON_CLK_QCOM=y 295CONFIG_COMMON_CLK_QCOM=y
293CONFIG_MSM_GCC_8916=y 296CONFIG_MSM_GCC_8916=y
297CONFIG_MSM_MMCC_8996=y
294CONFIG_HWSPINLOCK_QCOM=y 298CONFIG_HWSPINLOCK_QCOM=y
295CONFIG_MAILBOX=y 299CONFIG_MAILBOX=y
296CONFIG_ARM_MHU=y 300CONFIG_ARM_MHU=y