All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v3 1/3] cpufreq: imx6q: check speed grades for i.MX6ULL
@ 2018-05-22  6:28 ` Sébastien Szymanski
  0 siblings, 0 replies; 34+ messages in thread
From: Sébastien Szymanski @ 2018-05-22  6:28 UTC (permalink / raw)
  To: linux-arm-kernel
  Cc: Rafael J . Wysocki, Viresh Kumar, linux-pm, linux-kernel,
	Shawn Guo, Sascha Hauer, Fabio Estevam, Stefan Agner,
	Rob Herring, Mark Rutland, devicetree, Sébastien Szymanski

Check the max speed supported from the fuses for i.MX6ULL and update the
operating points table accordingly.

Signed-off-by: Sébastien Szymanski <sebastien.szymanski@armadeus.com>
---

Changes for v3:
 - none

Changes for v2:
 - none

 drivers/cpufreq/imx6q-cpufreq.c | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/drivers/cpufreq/imx6q-cpufreq.c b/drivers/cpufreq/imx6q-cpufreq.c
index 83cf631fc9bc..f094687cae52 100644
--- a/drivers/cpufreq/imx6q-cpufreq.c
+++ b/drivers/cpufreq/imx6q-cpufreq.c
@@ -266,6 +266,8 @@ static void imx6q_opp_check_speed_grading(struct device *dev)
 }
 
 #define OCOTP_CFG3_6UL_SPEED_696MHZ	0x2
+#define OCOTP_CFG3_6ULL_SPEED_792MHZ	0x2
+#define OCOTP_CFG3_6ULL_SPEED_900MHZ	0x3
 
 static void imx6ul_opp_check_speed_grading(struct device *dev)
 {
@@ -287,16 +289,30 @@ static void imx6ul_opp_check_speed_grading(struct device *dev)
 	 * Speed GRADING[1:0] defines the max speed of ARM:
 	 * 2b'00: Reserved;
 	 * 2b'01: 528000000Hz;
-	 * 2b'10: 696000000Hz;
-	 * 2b'11: Reserved;
+	 * 2b'10: 696000000Hz on i.MX6UL, 792000000Hz on i.MX6ULL;
+	 * 2b'11: 900000000Hz on i.MX6ULL only;
 	 * We need to set the max speed of ARM according to fuse map.
 	 */
 	val = readl_relaxed(base + OCOTP_CFG3);
 	val >>= OCOTP_CFG3_SPEED_SHIFT;
 	val &= 0x3;
-	if (val != OCOTP_CFG3_6UL_SPEED_696MHZ)
-		if (dev_pm_opp_disable(dev, 696000000))
-			dev_warn(dev, "failed to disable 696MHz OPP\n");
+
+	if (of_machine_is_compatible("fsl,imx6ul")) {
+		if (val != OCOTP_CFG3_6UL_SPEED_696MHZ)
+			if (dev_pm_opp_disable(dev, 696000000))
+				dev_warn(dev, "failed to disable 696MHz OPP\n");
+	}
+
+	if (of_machine_is_compatible("fsl,imx6ull")) {
+		if (val != OCOTP_CFG3_6ULL_SPEED_792MHZ)
+			if (dev_pm_opp_disable(dev, 792000000))
+				dev_warn(dev, "failed to disable 792MHz OPP\n");
+
+		if (val != OCOTP_CFG3_6ULL_SPEED_900MHZ)
+			if (dev_pm_opp_disable(dev, 900000000))
+				dev_warn(dev, "failed to disable 900MHz OPP\n");
+	}
+
 	iounmap(base);
 put_node:
 	of_node_put(np);
@@ -356,7 +372,8 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev)
 		goto put_reg;
 	}
 
-	if (of_machine_is_compatible("fsl,imx6ul"))
+	if (of_machine_is_compatible("fsl,imx6ul") ||
+	    of_machine_is_compatible("fsl,imx6ull"))
 		imx6ul_opp_check_speed_grading(cpu_dev);
 	else
 		imx6q_opp_check_speed_grading(cpu_dev);
-- 
2.16.1

^ permalink raw reply related	[flat|nested] 34+ messages in thread

end of thread, other threads:[~2018-06-28  0:50 UTC | newest]

Thread overview: 34+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-22  6:28 [PATCH v3 1/3] cpufreq: imx6q: check speed grades for i.MX6ULL Sébastien Szymanski
2018-05-22  6:28 ` Sébastien Szymanski
2018-05-22  6:28 ` Sébastien Szymanski
2018-05-22  6:28 ` [PATCH v3 2/3] ARM: dts: imx6ull: add operating points Sébastien Szymanski
2018-05-22  6:28   ` Sébastien Szymanski
2018-05-22  6:28   ` Sébastien Szymanski
2018-05-22  6:28 ` [PATCH v3 3/3] ARM: dts: imx6ull-colibri-wifi: remove " Sébastien Szymanski
2018-05-22  6:28   ` Sébastien Szymanski
2018-05-22  6:28   ` Sébastien Szymanski
2018-05-23  4:30   ` Viresh Kumar
2018-05-23  4:30     ` Viresh Kumar
2018-05-23  9:07     ` Stefan Agner
2018-05-23  9:07       ` Stefan Agner
2018-05-23  4:29 ` [PATCH v3 1/3] cpufreq: imx6q: check speed grades for i.MX6ULL Viresh Kumar
2018-05-23  4:29   ` Viresh Kumar
2018-06-05  7:07   ` Sébastien Szymanski
2018-06-05  7:07     ` Sébastien Szymanski
2018-06-05  7:07     ` Sébastien Szymanski
2018-05-23  4:30 ` Viresh Kumar
2018-05-23  4:30   ` Viresh Kumar
2018-05-23  9:02 ` Stefan Agner
2018-05-23  9:02   ` Stefan Agner
2018-06-05 11:01 ` Fabio Estevam
2018-06-05 11:01   ` Fabio Estevam
2018-06-11  5:38 ` Shawn Guo
2018-06-11  5:38   ` Shawn Guo
2018-06-12 14:57   ` Rafael J. Wysocki
2018-06-12 14:57     ` Rafael J. Wysocki
2018-06-25  8:01   ` Sébastien Szymanski
2018-06-25  8:01     ` Sébastien Szymanski
2018-06-25  8:06     ` Rafael J. Wysocki
2018-06-25  8:06       ` Rafael J. Wysocki
2018-06-28  0:48     ` Shawn Guo
2018-06-28  0:48       ` Shawn Guo

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.