Merge tag 'qcom-soc-for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/agross...

Qualcomm ARM Based SoC Updates for v4.8

* Add MSM9615 support

* tag 'qcom-soc-for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
  ARM: qcom: Add support for MDM9615

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --git a/arch/arm/mach-qcom/Kconfig b/arch/arm/mach-qcom/Kconfig
index 7349450..46ed10a 100644 (file)
--- a/arch/arm/mach-qcom/Kconfig
+++ b/arch/arm/mach-qcom/Kconfig
@@ -23,4 +23,8 @@ config ARCH_MSM8974
        bool "Enable support for MSM8974"
        select HAVE_ARM_ARCH_TIMER
 
+config ARCH_MDM9615
+       bool "Enable support for MDM9615"
+       select CLKSRC_QCOM
+
 endif

diff --git a/arch/arm/mach-qcom/board.c b/arch/arm/mach-qcom/board.c
index 6d8bbf7..d8060df 100644 (file)
--- a/arch/arm/mach-qcom/board.c
+++ b/arch/arm/mach-qcom/board.c
@@ -22,6 +22,7 @@ static const char * const qcom_dt_match[] __initconst = {
        "qcom,ipq8064",
        "qcom,msm8660-surf",
        "qcom,msm8960-cdp",
+       "qcom,mdm9615",
        NULL
 };