cpufreq: imx6q: check speed grades for i.MX6ULL

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>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Tested-by: Stefan Agner <stefan@agner.ch>
Reviewed-by: Stefan Agner <stefan@agner.ch>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
Acked-by: Shawn Guo <shawnguo@kernel.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/cpufreq/imx6q-cpufreq.c b/drivers/cpufreq/imx6q-cpufreq.c
index 83cf631fc9bc6fe9d9ff3a9ebea418f87a40d139..f094687cae5243dbeac2d6d0d853649701f1fd3c 100644 (file)
--- a/drivers/cpufreq/imx6q-cpufreq.c
+++ b/drivers/cpufreq/imx6q-cpufreq.c
@@ -266,6 +266,8 @@ put_node:
 }
 
 #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);