From: Peng Fan <peng.fan@nxp.com>
Date: Wed, 13 May 2020 06:59:16 +0000 (+0800)
Subject: LF-1392-3 ARM: dts: imx7ulp: support cpufreq dt
X-Git-Tag: rel_imx_5.10.35_2.0.0-somdevices.0~577^2~2^2~417
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=e4b6fd92f8fb93eb27dadba561654b056735309d;p=linux.git

LF-1392-3 ARM: dts: imx7ulp: support cpufreq dt

Support cpufreq dt method

Reviewed-by: Dong Aisheng <aisheng.dong@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---

diff --git a/arch/arm/boot/dts/imx7ulp-evk.dts b/arch/arm/boot/dts/imx7ulp-evk.dts
index 542ee033281b..20fe314e8ec5 100644
--- a/arch/arm/boot/dts/imx7ulp-evk.dts
+++ b/arch/arm/boot/dts/imx7ulp-evk.dts
@@ -235,7 +235,7 @@
 };
 
 &cpu0 {
-	arm-supply= <&sw1_reg>;
+	cpu-supply= <&sw1_reg>;
 };
 
 &lpspi3 {
diff --git a/arch/arm/boot/dts/imx7ulp.dtsi b/arch/arm/boot/dts/imx7ulp.dtsi
index 7025d860be65..442e8e807b2f 100644
--- a/arch/arm/boot/dts/imx7ulp.dtsi
+++ b/arch/arm/boot/dts/imx7ulp.dtsi
@@ -41,23 +41,34 @@
 			compatible = "arm,cortex-a7";
 			device_type = "cpu";
 			reg = <0xf00>;
-			operating-points = <
-				/* KHz	uV */
-				720000	1125000
-				500210	1025000
-			>;
 			clocks = <&smc1 IMX7ULP_CLK_ARM>,
-				 <&scg1 IMX7ULP_CLK_CORE_DIV>,
+				 <&scg1 IMX7ULP_CLK_CORE>,
 				 <&scg1 IMX7ULP_CLK_SYS_SEL>,
+				 <&scg1 IMX7ULP_CLK_HSRUN_CORE>,
 				 <&scg1 IMX7ULP_CLK_HSRUN_SYS_SEL>,
-				 <&scg1 IMX7ULP_CLK_HSRUN_CORE_DIV>,
-				 <&scg1 IMX7ULP_CLK_SPLL_PFD0>,
-				 <&scg1 IMX7ULP_CLK_SPLL_SEL>,
-				 <&scg1 IMX7ULP_CLK_FIRC>,
-				 <&scg1 IMX7ULP_CLK_SPLL>;
-			clock-names = "arm", "core_div", "sys_sel", "hsrun_sys_sel",
-				      "hsrun_core", "spll_pfd0", "spll_sel", "firc",
-				      "spll";
+				 <&scg1 IMX7ULP_CLK_FIRC>;
+			clock-names = "arm", "core", "scs_sel",
+				      "hsrun_core", "hsrun_scs_sel",
+				      "firc";
+			operating-points-v2 = <&cpu0_opp_table>;
+		};
+	};
+
+	cpu0_opp_table: opp-table {
+		compatible = "operating-points-v2";
+		opp-shared;
+
+		opp-500210000 {
+			opp-hz = /bits/ 64 <500210000>;
+			opp-microvolt = <1025000>;
+			clock-latency-ns = <150000>;
+			opp-suspend;
+		};
+
+		opp-720000000 {
+			opp-hz = /bits/ 64 <720000000>;
+			opp-microvolt = <1125000>;
+			clock-latency-ns = <150000>;
 		};
 	};