ENGR00276593-1 [iMX6x:Cpufreq]- Rename references to iMX6q

Change references to iMX6q to iMX6 as the CPUFREQ driver is
common to all iMX6x chips.
Reanme imx6q-cpufreq.c to cpufreq-imx6.c.

Signed-off-by: Ranjani Vaidyanathan <ra5478@freescale.com>

diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm
index 6e57543fe0b981e55cfdd9623c5eb1ed910ffd8c..ae5a2e8472d3abe0a0264f3192110d979a1550bc 100644 (file)
--- a/drivers/cpufreq/Kconfig.arm
+++ b/drivers/cpufreq/Kconfig.arm
@@ -67,12 +67,12 @@ config ARM_HIGHBANK_CPUFREQ
 
          If in doubt, say N.
 
-config ARM_IMX6Q_CPUFREQ
-       tristate "Freescale i.MX6Q cpufreq support"
-       depends on SOC_IMX6Q
+config ARM_IMX6_CPUFREQ
+       tristate "Freescale i.MX6 cpufreq support"
+       depends on SOC_IMX6Q || SOC_IMX6SL
        depends on REGULATOR_ANATOP
        help
-         This adds cpufreq driver support for Freescale i.MX6Q SOC.
+         This adds cpufreq driver support for Freescale i.MX6 series SOC.
 
          If in doubt, say N.
 

diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile
index 49e83b62900de78f6850f79635b0201bbfabe6df..12f2e7042b7dcf07ff14e9e657766bf576013950 100644 (file)
--- a/drivers/cpufreq/Makefile
+++ b/drivers/cpufreq/Makefile
@@ -59,7 +59,7 @@ obj-$(CONFIG_ARM_EXYNOS4X12_CPUFREQ)  += exynos4x12-cpufreq.o
 obj-$(CONFIG_ARM_EXYNOS5250_CPUFREQ)   += exynos5250-cpufreq.o
 obj-$(CONFIG_ARM_EXYNOS5440_CPUFREQ)   += exynos5440-cpufreq.o
 obj-$(CONFIG_ARM_HIGHBANK_CPUFREQ)     += highbank-cpufreq.o
-obj-$(CONFIG_ARM_IMX6Q_CPUFREQ)                += imx6q-cpufreq.o
+obj-$(CONFIG_ARM_IMX6_CPUFREQ)         += cpufreq-imx6.o
 obj-$(CONFIG_ARM_INTEGRATOR)           += integrator-cpufreq.o
 obj-$(CONFIG_ARM_KIRKWOOD_CPUFREQ)     += kirkwood-cpufreq.o
 obj-$(CONFIG_ARM_OMAP2PLUS_CPUFREQ)    += omap-cpufreq.o

diff --git a/drivers/cpufreq/imx6q-cpufreq.c b/drivers/cpufreq/cpufreq-imx6.c
similarity index 86%
rename from drivers/cpufreq/imx6q-cpufreq.c
rename to drivers/cpufreq/cpufreq-imx6.c
index d704f42082f2dfd5924ae8cb74b8c932d94343c2..d301984bfa41a688af293cfd0ac33eff2c163d03 100644 (file)
--- a/drivers/cpufreq/imx6q-cpufreq.c
+++ b/drivers/cpufreq/cpufreq-imx6.c
@@ -37,20 +37,20 @@ struct soc_opp {
        u32 soc_volt;
 };
 
-static struct soc_opp *imx6q_soc_opp;
+static struct soc_opp *imx6_soc_opp;
 static u32 soc_opp_count;
 
-static int imx6q_verify_speed(struct cpufreq_policy *policy)
+static int imx6_verify_speed(struct cpufreq_policy *policy)
 {
        return cpufreq_frequency_table_verify(policy, freq_table);
 }
 
-static unsigned int imx6q_get_speed(unsigned int cpu)
+static unsigned int imx6_get_speed(unsigned int cpu)
 {
        return clk_get_rate(arm_clk) / 1000;
 }
 
-static int imx6q_set_target(struct cpufreq_policy *policy,
+static int imx6_set_target(struct cpufreq_policy *policy,
                            unsigned int target_freq, unsigned int relation)
 {
        struct cpufreq_freqs freqs;
@@ -90,13 +90,13 @@ static int imx6q_set_target(struct cpufreq_policy *policy,
 
        /* Find the matching VDDSOC/VDDPU operating voltage */
        while (soc_opp_index < soc_opp_count) {
-               if (freqs.new == imx6q_soc_opp[soc_opp_index].arm_freq)
+               if (freqs.new == imx6_soc_opp[soc_opp_index].arm_freq)
                        break;
                soc_opp_index++;
        }
        if (soc_opp_index >= soc_opp_count) {
                dev_err(cpu_dev,
-                       "Cannot find matching imx6q_soc_opp voltage\n");
+                       "Cannot find matching imx6_soc_opp voltage\n");
                        return -EINVAL;
        }
 
@@ -115,7 +115,7 @@ static int imx6q_set_target(struct cpufreq_policy *policy,
        if (freqs.new > freqs.old) {
                if (regulator_is_enabled(pu_reg)) {
                        ret = regulator_set_voltage_tol(pu_reg,
-                                       imx6q_soc_opp[soc_opp_index].soc_volt,
+                                       imx6_soc_opp[soc_opp_index].soc_volt,
                                        0);
                        if (ret) {
                                dev_err(cpu_dev,
@@ -124,7 +124,7 @@ static int imx6q_set_target(struct cpufreq_policy *policy,
                        }
                }
                ret = regulator_set_voltage_tol(soc_reg,
-                               imx6q_soc_opp[soc_opp_index].soc_volt, 0);
+                               imx6_soc_opp[soc_opp_index].soc_volt, 0);
                if (ret) {
                        dev_err(cpu_dev,
                                "failed to scale vddsoc up: %d\n", ret);
@@ -188,7 +188,7 @@ static int imx6q_set_target(struct cpufreq_policy *policy,
                }
 
                ret = regulator_set_voltage_tol(soc_reg,
-                               imx6q_soc_opp[soc_opp_index].soc_volt, 0);
+                               imx6_soc_opp[soc_opp_index].soc_volt, 0);
                if (ret) {
                        dev_err(cpu_dev,
                                "failed to scale vddsoc down: %d\n", ret);
@@ -197,7 +197,7 @@ static int imx6q_set_target(struct cpufreq_policy *policy,
 
                if (regulator_is_enabled(pu_reg)) {
                        ret = regulator_set_voltage_tol(pu_reg,
-                                       imx6q_soc_opp[soc_opp_index].soc_volt,
+                                       imx6_soc_opp[soc_opp_index].soc_volt,
                                        0);
                        if (ret) {
                                dev_err(cpu_dev,
@@ -220,7 +220,7 @@ err1:
        return -1;
 }
 
-static int imx6q_cpufreq_init(struct cpufreq_policy *policy)
+static int imx6_cpufreq_init(struct cpufreq_policy *policy)
 {
        int ret;
 
@@ -241,28 +241,28 @@ static int imx6q_cpufreq_init(struct cpufreq_policy *policy)
        return 0;
 }
 
-static int imx6q_cpufreq_exit(struct cpufreq_policy *policy)
+static int imx6_cpufreq_exit(struct cpufreq_policy *policy)
 {
        cpufreq_frequency_table_put_attr(policy->cpu);
        return 0;
 }
 
-static struct freq_attr *imx6q_cpufreq_attr[] = {
+static struct freq_attr *imx6_cpufreq_attr[] = {
        &cpufreq_freq_attr_scaling_available_freqs,
        NULL,
 };
 
-static struct cpufreq_driver imx6q_cpufreq_driver = {
-       .verify = imx6q_verify_speed,
-       .target = imx6q_set_target,
-       .get = imx6q_get_speed,
-       .init = imx6q_cpufreq_init,
-       .exit = imx6q_cpufreq_exit,
-       .name = "imx6q-cpufreq",
-       .attr = imx6q_cpufreq_attr,
+static struct cpufreq_driver imx6_cpufreq_driver = {
+       .verify = imx6_verify_speed,
+       .target = imx6_set_target,
+       .get = imx6_get_speed,
+       .init = imx6_cpufreq_init,
+       .exit = imx6_cpufreq_exit,
+       .name = "imx6-cpufreq",
+       .attr = imx6_cpufreq_attr,
 };
 
-static int imx6q_cpufreq_probe(struct platform_device *pdev)
+static int imx6_cpufreq_probe(struct platform_device *pdev)
 {
        struct device_node *np;
        struct opp *opp;
@@ -340,11 +340,11 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev)
        }
 
        /* Get the VDDSOC/VDDPU voltages that need to track the CPU voltages. */
-       imx6q_soc_opp = devm_kzalloc(cpu_dev,
+       imx6_soc_opp = devm_kzalloc(cpu_dev,
                                        sizeof(struct soc_opp) * (nr / 2),
                                        GFP_KERNEL);
 
-       if (imx6q_soc_opp == NULL) {
+       if (imx6_soc_opp == NULL) {
                dev_err(cpu_dev, "No Memory for VDDSOC/PU table\n");
                goto free_freq_table;
        }
@@ -375,8 +375,8 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev)
                                goto free_freq_table;
                        }
                }
-               imx6q_soc_opp[i].arm_freq = freq;
-               imx6q_soc_opp[i].soc_volt = volt;
+               imx6_soc_opp[i].arm_freq = freq;
+               imx6_soc_opp[i].soc_volt = volt;
                soc_opp_count++;
        }
        rcu_read_unlock();
@@ -413,7 +413,7 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev)
        if (ret > 0)
                transition_latency += ret * 1000;
 
-       ret = cpufreq_register_driver(&imx6q_cpufreq_driver);
+       ret = cpufreq_register_driver(&imx6_cpufreq_driver);
        if (ret) {
                dev_err(cpu_dev, "failed register driver: %d\n", ret);
                goto free_freq_table;
@@ -429,24 +429,24 @@ put_node:
        return ret;
 }
 
-static int imx6q_cpufreq_remove(struct platform_device *pdev)
+static int imx6_cpufreq_remove(struct platform_device *pdev)
 {
-       cpufreq_unregister_driver(&imx6q_cpufreq_driver);
+       cpufreq_unregister_driver(&imx6_cpufreq_driver);
        opp_free_cpufreq_table(cpu_dev, &freq_table);
 
        return 0;
 }
 
-static struct platform_driver imx6q_cpufreq_platdrv = {
+static struct platform_driver imx6_cpufreq_platdrv = {
        .driver = {
-               .name   = "imx6q-cpufreq",
+               .name   = "imx6-cpufreq",
                .owner  = THIS_MODULE,
        },
-       .probe          = imx6q_cpufreq_probe,
-       .remove         = imx6q_cpufreq_remove,
+       .probe          = imx6_cpufreq_probe,
+       .remove         = imx6_cpufreq_remove,
 };
-module_platform_driver(imx6q_cpufreq_platdrv);
+module_platform_driver(imx6_cpufreq_platdrv);
 
 MODULE_AUTHOR("Shawn Guo <shawn.guo@linaro.org>");
-MODULE_DESCRIPTION("Freescale i.MX6Q cpufreq driver");
+MODULE_DESCRIPTION("Freescale i.MX6 cpufreq driver");
 MODULE_LICENSE("GPL");