cpufreq: imx6q: Move speed grading check to cpufreq driver

[linux-2.6-microblaze.git] / arch / arm / mach-imx / mach-imx6q.c

diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c
index 5707113..7d80a0a 100644 (file)
--- a/arch/arm/mach-imx/mach-imx6q.c
+++ b/arch/arm/mach-imx/mach-imx6q.c
@@ -286,88 +286,6 @@ static void __init imx6q_init_machine(void)
        imx6q_axi_init();
 }
 
-#define OCOTP_CFG3                     0x440
-#define OCOTP_CFG3_SPEED_SHIFT         16
-#define OCOTP_CFG3_SPEED_1P2GHZ                0x3
-#define OCOTP_CFG3_SPEED_996MHZ                0x2
-#define OCOTP_CFG3_SPEED_852MHZ                0x1
-
-static void __init imx6q_opp_check_speed_grading(struct device *cpu_dev)
-{
-       struct device_node *np;
-       void __iomem *base;
-       u32 val;
-
-       np = of_find_compatible_node(NULL, NULL, "fsl,imx6q-ocotp");
-       if (!np) {
-               pr_warn("failed to find ocotp node\n");
-               return;
-       }
-
-       base = of_iomap(np, 0);
-       if (!base) {
-               pr_warn("failed to map ocotp\n");
-               goto put_node;
-       }
-
-       /*
-        * SPEED_GRADING[1:0] defines the max speed of ARM:
-        * 2b'11: 1200000000Hz;
-        * 2b'10: 996000000Hz;
-        * 2b'01: 852000000Hz; -- i.MX6Q Only, exclusive with 996MHz.
-        * 2b'00: 792000000Hz;
-        * 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_SPEED_1P2GHZ) && cpu_is_imx6q())
-               if (dev_pm_opp_disable(cpu_dev, 1200000000))
-                       pr_warn("failed to disable 1.2 GHz OPP\n");
-       if (val < OCOTP_CFG3_SPEED_996MHZ)
-               if (dev_pm_opp_disable(cpu_dev, 996000000))
-                       pr_warn("failed to disable 996 MHz OPP\n");
-       if (cpu_is_imx6q()) {
-               if (val != OCOTP_CFG3_SPEED_852MHZ)
-                       if (dev_pm_opp_disable(cpu_dev, 852000000))
-                               pr_warn("failed to disable 852 MHz OPP\n");
-       }
-       iounmap(base);
-put_node:
-       of_node_put(np);
-}
-
-static void __init imx6q_opp_init(void)
-{
-       struct device_node *np;
-       struct device *cpu_dev = get_cpu_device(0);
-
-       if (!cpu_dev) {
-               pr_warn("failed to get cpu0 device\n");
-               return;
-       }
-       np = of_node_get(cpu_dev->of_node);
-       if (!np) {
-               pr_warn("failed to find cpu0 node\n");
-               return;
-       }
-
-       if (dev_pm_opp_of_add_table(cpu_dev)) {
-               pr_warn("failed to init OPP table\n");
-               goto put_node;
-       }
-
-       imx6q_opp_check_speed_grading(cpu_dev);
-
-put_node:
-       of_node_put(np);
-}
-
-static struct platform_device imx6q_cpufreq_pdev = {
-       .name = "imx6q-cpufreq",
-};
-
 static void __init imx6q_init_late(void)
 {
        /*
@@ -380,10 +298,8 @@ static void __init imx6q_init_late(void)
            (cpu_is_imx6dl() && imx_get_soc_revision() > IMX_CHIP_REVISION_1_0))
                imx6q_cpuidle_init();
 
-       if (IS_ENABLED(CONFIG_ARM_IMX6Q_CPUFREQ)) {
-               imx6q_opp_init();
-               platform_device_register(&imx6q_cpufreq_pdev);
-       }
+       if (IS_ENABLED(CONFIG_ARM_IMX6Q_CPUFREQ))
+               platform_device_register_simple("imx6q-cpufreq", -1, NULL, 0);
 }
 
 static void __init imx6q_map_io(void)