Browse Source

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

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>
Olof Johansson 9 years ago
parent
commit
b45efe38f6
2 changed files with 5 additions and 0 deletions
  1. 4 0
      arch/arm/mach-qcom/Kconfig
  2. 1 0
      arch/arm/mach-qcom/board.c

+ 4 - 0
arch/arm/mach-qcom/Kconfig

@@ -23,4 +23,8 @@ config ARCH_MSM8974
 	bool "Enable support for MSM8974"
 	bool "Enable support for MSM8974"
 	select HAVE_ARM_ARCH_TIMER
 	select HAVE_ARM_ARCH_TIMER
 
 
+config ARCH_MDM9615
+	bool "Enable support for MDM9615"
+	select CLKSRC_QCOM
+
 endif
 endif

+ 1 - 0
arch/arm/mach-qcom/board.c

@@ -22,6 +22,7 @@ static const char * const qcom_dt_match[] __initconst = {
 	"qcom,ipq8064",
 	"qcom,ipq8064",
 	"qcom,msm8660-surf",
 	"qcom,msm8660-surf",
 	"qcom,msm8960-cdp",
 	"qcom,msm8960-cdp",
+	"qcom,mdm9615",
 	NULL
 	NULL
 };
 };