From: Olof Johansson Date: Thu, 2 Apr 2015 00:36:52 +0000 (-0700) Subject: Merge tag 'qcom-arm64-for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/galak... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e5710319382e2e204b8386e05ee76cdcb41f651c;p=linux-beck.git 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 --- e5710319382e2e204b8386e05ee76cdcb41f651c diff --cc arch/arm64/configs/defconfig index f3c8619f8fe1,d54a1f60b5cc..96bba367f80c --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@@ -33,7 -33,7 +33,8 @@@ CONFIG_MODULE_UNLOAD= # 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 CONFIG_ARCH_XGENE=y @@@ -95,9 -94,9 +96,11 @@@ CONFIG_SERIAL_8250_CONSOLE= 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 CONFIG_VIRTIO_CONSOLE=y # CONFIG_HW_RANDOM is not set CONFIG_SPI=y