From 0a10f73d0b334373b00dd0b45f513b37dc6cfc28 Mon Sep 17 00:00:00 2001
From: "hong.guo" <hong.guo@amlogic.com>
Date: Mon, 5 Feb 2018 18:43:10 +0800
Subject: [PATCH] CPUFREQ: modify cpufreq dts.

PD#156734: cpufreq: modify cpufreq dts.

Change-Id: I16113e3414a3e336cbd4c0eb869706dd3d22a15b
Signed-off-by: hong.guo <hong.guo@amlogic.com>
---
 arch/arm64/boot/dts/amlogic/g12a_pxp.dts   | 46 +++++++++++++++++++
 arch/arm64/boot/dts/amlogic/g12a_skt.dts   | 46 +++++++++++++++++++
 arch/arm64/boot/dts/amlogic/mesong12a.dtsi | 51 ----------------------
 3 files changed, 92 insertions(+), 51 deletions(-)

diff --git a/arch/arm64/boot/dts/amlogic/g12a_pxp.dts b/arch/arm64/boot/dts/amlogic/g12a_pxp.dts
index 4bb99c4d3dab..152ac7cb3c2d 100644
--- a/arch/arm64/boot/dts/amlogic/g12a_pxp.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_pxp.dts
@@ -638,6 +638,52 @@
 	};
 	/* Audio Related end */
 
+	cpu_opp_table0: cpu_opp_table0 {
+		compatible = "operating-points-v2";
+		opp-shared;
+
+		opp00 {
+			opp-hz = /bits/ 64 <100000000>;
+			opp-microvolt = <731000>;
+		};
+		opp01 {
+			opp-hz = /bits/ 64 <250000000>;
+			opp-microvolt = <731000>;
+		};
+		opp02 {
+			opp-hz = /bits/ 64 <500000000>;
+			opp-microvolt = <731000>;
+		};
+		opp03 {
+			opp-hz = /bits/ 64 <667000000>;
+			opp-microvolt = <731000>;
+		};
+		opp04 {
+			opp-hz = /bits/ 64 <1000000000>;
+			opp-microvolt = <731000>;
+		};
+		opp05 {
+			opp-hz = /bits/ 64 <1200000000>;
+			opp-microvolt = <731000>;
+		};
+		opp06 {
+			opp-hz = /bits/ 64 <1398000000>;
+			opp-microvolt = <761000>;
+		};
+		opp07 {
+			opp-hz = /bits/ 64 <1512000000>;
+			opp-microvolt = <791000>;
+		};
+		opp08 {
+			opp-hz = /bits/ 64 <1608000000>;
+			opp-microvolt = <831000>;
+		};
+		opp09 {
+			opp-hz = /bits/ 64 <1896000000>;
+			opp-microvolt = <981000>;
+		};
+	};
+
 	cpufreq-meson {
 		compatible = "amlogic, cpufreq-meson";
 		pinctrl-names = "default";
diff --git a/arch/arm64/boot/dts/amlogic/g12a_skt.dts b/arch/arm64/boot/dts/amlogic/g12a_skt.dts
index 5b0ef02d6952..038fc60121c2 100644
--- a/arch/arm64/boot/dts/amlogic/g12a_skt.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_skt.dts
@@ -1012,6 +1012,52 @@
 	};
 	/* Audio Related end */
 
+	cpu_opp_table0: cpu_opp_table0 {
+		compatible = "operating-points-v2";
+		opp-shared;
+
+		opp00 {
+			opp-hz = /bits/ 64 <100000000>;
+			opp-microvolt = <731000>;
+		};
+		opp01 {
+			opp-hz = /bits/ 64 <250000000>;
+			opp-microvolt = <731000>;
+		};
+		opp02 {
+			opp-hz = /bits/ 64 <500000000>;
+			opp-microvolt = <731000>;
+		};
+		opp03 {
+			opp-hz = /bits/ 64 <667000000>;
+			opp-microvolt = <731000>;
+		};
+		opp04 {
+			opp-hz = /bits/ 64 <1000000000>;
+			opp-microvolt = <731000>;
+		};
+		opp05 {
+			opp-hz = /bits/ 64 <1200000000>;
+			opp-microvolt = <731000>;
+		};
+		opp06 {
+			opp-hz = /bits/ 64 <1398000000>;
+			opp-microvolt = <761000>;
+		};
+		opp07 {
+			opp-hz = /bits/ 64 <1512000000>;
+			opp-microvolt = <791000>;
+		};
+		opp08 {
+			opp-hz = /bits/ 64 <1608000000>;
+			opp-microvolt = <831000>;
+		};
+		opp09 {
+			opp-hz = /bits/ 64 <1896000000>;
+			opp-microvolt = <981000>;
+		};
+	};
+
 	cpufreq-meson {
 		compatible = "amlogic, cpufreq-meson";
 		pinctrl-names = "default";
diff --git a/arch/arm64/boot/dts/amlogic/mesong12a.dtsi b/arch/arm64/boot/dts/amlogic/mesong12a.dtsi
index c80fc9134fb6..834bf024fce5 100644
--- a/arch/arm64/boot/dts/amlogic/mesong12a.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesong12a.dtsi
@@ -136,57 +136,6 @@
 		};
 	};
 
-		cpu_opp_table0: cpu_opp_table0 {
-			compatible = "operating-points-v2";
-			opp-shared;
-
-			opp00 {
-				opp-hz = /bits/ 64 <100000000>;
-				opp-microvolt = <761000>;
-			};
-			opp01 {
-				opp-hz = /bits/ 64 <250000000>;
-				opp-microvolt = <781000>;
-			};
-			opp02 {
-				opp-hz = /bits/ 64 <500000000>;
-				opp-microvolt = <801000>;
-			};
-			opp03 {
-				opp-hz = /bits/ 64 <667000000>;
-				opp-microvolt = <851000>;
-			};
-			opp04 {
-				opp-hz = /bits/ 64 <1000000000>;
-				opp-microvolt = <881000>;
-			};
-			opp05 {
-				opp-hz = /bits/ 64 <1200000000>;
-				opp-microvolt = <891000>;
-			};
-			opp06 {
-				opp-hz = /bits/ 64 <1398000000>;
-				opp-microvolt = <921000>;
-			};
-			opp07 {
-				opp-hz = /bits/ 64 <1512000000>;
-				opp-microvolt = <951000>;
-			};
-			opp08 {
-				opp-hz = /bits/ 64 <1608000000>;
-				opp-microvolt = <991000>;
-			};
-			opp09 {
-				opp-hz = /bits/ 64 <1800000000>;
-				opp-microvolt = <1001000>;
-			};
-
-			opp10 {
-				opp-hz = /bits/ 64 <2016000000>;
-				opp-microvolt = <1011000>;
-			};
-		};
-
 	timer {
 		compatible = "arm,armv8-timer";
 		interrupts = <GIC_PPI 13 0xff08>,