commit 86dfe6a8cc55c91732f8b5707c5fc8ea1028e1c3
author Linux Build Service Account <lnxbuild@localhost> Tue Apr 04 12:13:51 2017 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Apr 04 12:13:51 2017 -0700
tree 7f69e96d7591c3081a63fc89cc2e9fe2e03ae142
parent 95190931769b70fd96a23fc05cdc2f14674fffdf
parent d13ff193acd62f3311448f033d5201053b1c95fb

Merge "defconfig: arm64: Enable the OSM clock driver for SDM845" into msm-4.9

arch/arm64/configs/sdm845-perf_defconfig

diff --git a/arch/arm64/configs/sdm845-perf_defconfig b/arch/arm64/configs/sdm845-perf_defconfig
index 8207c51..395ae3f 100644
--- a/arch/arm64/configs/sdm845-perf_defconfig
+++ b/arch/arm64/configs/sdm845-perf_defconfig
@@ -403,6 +403,7 @@
 CONFIG_MSM_DISPCC_SDM845=y
 CONFIG_CLOCK_QPNP_DIV=y
 CONFIG_MSM_CLK_RPMH=y
+CONFIG_CLOCK_CPU_OSM=y
 CONFIG_REMOTE_SPINLOCK_MSM=y
 CONFIG_IOMMU_IO_PGTABLE_FAST=y
 CONFIG_ARM_SMMU=y

arch/arm64/configs/sdm845_defconfig

diff --git a/arch/arm64/configs/sdm845_defconfig b/arch/arm64/configs/sdm845_defconfig
index 54f2d53..1a86941 100644
--- a/arch/arm64/configs/sdm845_defconfig
+++ b/arch/arm64/configs/sdm845_defconfig
@@ -423,6 +423,7 @@
 CONFIG_MSM_DISPCC_SDM845=y
 CONFIG_CLOCK_QPNP_DIV=y
 CONFIG_MSM_CLK_RPMH=y
+CONFIG_CLOCK_CPU_OSM=y
 CONFIG_REMOTE_SPINLOCK_MSM=y
 CONFIG_IOMMU_IO_PGTABLE_FAST=y
 CONFIG_ARM_SMMU=y