diff options
| author | Olof Johansson <olof@lixom.net> | 2015-04-01 17:36:52 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-04-01 17:36:52 -0700 |
| commit | e5710319382e2e204b8386e05ee76cdcb41f651c (patch) | |
| tree | f09ed88aabc241c2ab4aa9b7a46cd8202b5374cd /arch/arm64/configs | |
| parent | c4bb799588f64d7c586ba009f97ccfe7beeae706 (diff) | |
| parent | d7f64a44356ce138aec2da091d7291446f52dcc5 (diff) | |
| download | linux-stable-e5710319382e2e204b8386e05ee76cdcb41f651c.tar.gz linux-stable-e5710319382e2e204b8386e05ee76cdcb41f651c.tar.bz2 linux-stable-e5710319382e2e204b8386e05ee76cdcb41f651c.zip | |
Merge tag 'qcom-arm64-for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom into next/arm64
Merge "qcom ARM64 changes for v4.1" from Kumar Gala:
Qualcomm ARM64 Updates for v4.1
* Add support for Qualcomm MSM8916 SoC
* tag 'qcom-arm64-for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom:
arm64: qcom: Add support for Qualcomm MSM8916 SoC
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm64/configs')
| -rw-r--r-- | arch/arm64/configs/defconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index f3c8619f8fe1..96bba367f80c 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -33,6 +33,7 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_IOSCHED_DEADLINE is not set CONFIG_ARCH_FSL_LS2085A=y CONFIG_ARCH_MEDIATEK=y +CONFIG_ARCH_QCOM=y CONFIG_ARCH_SPRD=y CONFIG_ARCH_THUNDER=y CONFIG_ARCH_VEXPRESS=y @@ -95,6 +96,8 @@ CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_MT6577=y CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y +CONFIG_SERIAL_MSM=y +CONFIG_SERIAL_MSM_CONSOLE=y CONFIG_SERIAL_OF_PLATFORM=y CONFIG_SERIAL_XILINX_PS_UART=y CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y @@ -102,6 +105,7 @@ CONFIG_VIRTIO_CONSOLE=y # CONFIG_HW_RANDOM is not set CONFIG_SPI=y CONFIG_SPI_PL022=y +CONFIG_PINCTRL_MSM8916=y CONFIG_GPIO_PL061=y CONFIG_GPIO_XGENE=y # CONFIG_HWMON is not set @@ -131,6 +135,8 @@ CONFIG_RTC_DRV_EFI=y CONFIG_RTC_DRV_XGENE=y CONFIG_VIRTIO_BALLOON=y CONFIG_VIRTIO_MMIO=y +CONFIG_COMMON_CLK_QCOM=y +CONFIG_MSM_GCC_8916=y # CONFIG_IOMMU_SUPPORT is not set CONFIG_PHY_XGENE=y CONFIG_EXT2_FS=y |