diff options
| author | Olof Johansson <olof@lixom.net> | 2016-07-04 22:35:47 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-07-04 22:35:47 -0700 |
| commit | b45efe38f6e4a7441b252a9ce2576afc63c70c59 (patch) | |
| tree | 2064480847e408483478aeb578e3f57d5484dbca | |
| parent | d6e29da921ccd19f6727038f8b73bb76ef713268 (diff) | |
| parent | 78700c0a2102dbe0fb35b6c146a639dc4622036f (diff) | |
| download | linux-b45efe38f6e4a7441b252a9ce2576afc63c70c59.tar.bz2 | |
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>
| -rw-r--r-- | arch/arm/mach-qcom/Kconfig | 4 | ||||
| -rw-r--r-- | arch/arm/mach-qcom/board.c | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-qcom/Kconfig b/arch/arm/mach-qcom/Kconfig index 73494500b51c..46ed10a807f0 100644 --- 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 6d8bbf7d39d8..d8060dfd1a21 100644 --- 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 }; |