diff --git a/arch/arm/boot/dts/qcom/sdm660.dtsi b/arch/arm/boot/dts/qcom/sdm660.dtsi
index c64c0c754030..e9f135133127 100644
--- a/arch/arm/boot/dts/qcom/sdm660.dtsi
+++ b/arch/arm/boot/dts/qcom/sdm660.dtsi
@@ -1177,16 +1177,8 @@
 
 	msm_cpufreq: qcom,msm-cpufreq {
 		compatible = "qcom,msm-cpufreq";
-		clock-names = "cpu0_clk", "cpu1_clk", "cpu2_clk",
-				"cpu3_clk", "cpu4_clk", "cpu5_clk",
-				"cpu6_clk", "cpu7_clk";
+		clock-names = "cpu0_clk", "cpu4_clk";
 		clocks = <&clock_cpu PWRCL_CLK>,
-			 <&clock_cpu PWRCL_CLK>,
-			 <&clock_cpu PWRCL_CLK>,
-			 <&clock_cpu PWRCL_CLK>,
-			 <&clock_cpu PERFCL_CLK>,
-			 <&clock_cpu PERFCL_CLK>,
-			 <&clock_cpu PERFCL_CLK>,
 			 <&clock_cpu PERFCL_CLK>;
 
 		qcom,governor-per-policy;
diff --git a/drivers/cpufreq/qcom-cpufreq.c b/drivers/cpufreq/qcom-cpufreq.c
index 2aa7b783f276..cb7323886082 100644
--- a/drivers/cpufreq/qcom-cpufreq.c
+++ b/drivers/cpufreq/qcom-cpufreq.c
@@ -3,7 +3,7 @@
  * MSM architecture cpufreq driver
  *
  * Copyright (C) 2007 Google, Inc.
- * Copyright (c) 2007-2016, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2007-2017, The Linux Foundation. All rights reserved.
  * Author: Mike A. Chan <mikechan@google.com>
  *
  * This software is licensed under the terms of the GNU General Public
@@ -390,8 +390,10 @@ static int __init msm_cpufreq_probe(struct platform_device *pdev)
 	for_each_possible_cpu(cpu) {
 		snprintf(clk_name, sizeof(clk_name), "cpu%d_clk", cpu);
 		c = devm_clk_get(dev, clk_name);
-		if (IS_ERR(c))
+		if (cpu == 0 && IS_ERR(c))
 			return PTR_ERR(c);
+		else if (IS_ERR(c))
+			c = cpu_clk[cpu-1];
 		cpu_clk[cpu] = c;
 	}
 	hotplug_ready = true;