cpufreq: tegra20: Remove EMC clock usage

[linux.git] / drivers / cpufreq / tegra20-cpufreq.c

diff --git a/drivers/cpufreq/tegra20-cpufreq.c b/drivers/cpufreq/tegra20-cpufreq.c
index 2bd62845e9d5582e1f4bafec365794af4c975808..4b09a8b410c4117d1bf77252cbff14eee14ea11e 100644 (file)
--- a/drivers/cpufreq/tegra20-cpufreq.c
+++ b/drivers/cpufreq/tegra20-cpufreq.c
@@ -16,16 +16,12 @@
  *
  */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/sched.h>
+#include <linux/clk.h>
 #include <linux/cpufreq.h>
-#include <linux/delay.h>
-#include <linux/init.h>
 #include <linux/err.h>
-#include <linux/clk.h>
-#include <linux/io.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/types.h>
 
 static struct cpufreq_frequency_table freq_table[] = {
        { .frequency = 216000 },
@@ -44,7 +40,6 @@ static struct cpufreq_frequency_table freq_table[] = {
 static struct clk *cpu_clk;
 static struct clk *pll_x_clk;
 static struct clk *pll_p_clk;
-static struct clk *emc_clk;
 static bool pll_x_prepared;
 
 static unsigned int tegra_get_intermediate(struct cpufreq_policy *policy,
@@ -95,17 +90,6 @@ static int tegra_target(struct cpufreq_policy *policy, unsigned int index)
        unsigned int ifreq = clk_get_rate(pll_p_clk) / 1000;
        int ret = 0;
 
-       /*
-        * Vote on memory bus frequency based on cpu frequency
-        * This sets the minimum frequency, display or avp may request higher
-        */
-       if (rate >= 816000)
-               clk_set_rate(emc_clk, 600000000); /* cpu 816 MHz, emc max */
-       else if (rate >= 456000)
-               clk_set_rate(emc_clk, 300000000); /* cpu 456 MHz, emc 150Mhz */
-       else
-               clk_set_rate(emc_clk, 100000000);  /* emc 50Mhz */
-
        /*
         * target freq == pll_p, don't need to take extra reference to pll_x_clk
         * as it isn't used anymore.
@@ -141,14 +125,12 @@ static int tegra_cpu_init(struct cpufreq_policy *policy)
        if (policy->cpu >= NUM_CPUS)
                return -EINVAL;
 
-       clk_prepare_enable(emc_clk);
        clk_prepare_enable(cpu_clk);
 
        /* FIXME: what's the actual transition time? */
        ret = cpufreq_generic_init(policy, freq_table, 300 * 1000);
        if (ret) {
                clk_disable_unprepare(cpu_clk);
-               clk_disable_unprepare(emc_clk);
                return ret;
        }
 
@@ -160,7 +142,6 @@ static int tegra_cpu_init(struct cpufreq_policy *policy)
 static int tegra_cpu_exit(struct cpufreq_policy *policy)
 {
        clk_disable_unprepare(cpu_clk);
-       clk_disable_unprepare(emc_clk);
        return 0;
 }
 
@@ -192,25 +173,17 @@ static int __init tegra_cpufreq_init(void)
        if (IS_ERR(pll_p_clk))
                return PTR_ERR(pll_p_clk);
 
-       emc_clk = clk_get_sys("cpu", "emc");
-       if (IS_ERR(emc_clk)) {
-               clk_put(cpu_clk);
-               return PTR_ERR(emc_clk);
-       }
-
        return cpufreq_register_driver(&tegra_cpufreq_driver);
 }
 
 static void __exit tegra_cpufreq_exit(void)
 {
-        cpufreq_unregister_driver(&tegra_cpufreq_driver);
-       clk_put(emc_clk);
+       cpufreq_unregister_driver(&tegra_cpufreq_driver);
        clk_put(cpu_clk);
 }
 
-
 MODULE_AUTHOR("Colin Cross <ccross@android.com>");
-MODULE_DESCRIPTION("cpufreq driver for Nvidia Tegra2");
+MODULE_DESCRIPTION("NVIDIA Tegra20 cpufreq driver");
 MODULE_LICENSE("GPL");
 module_init(tegra_cpufreq_init);
 module_exit(tegra_cpufreq_exit);