@@ -25,6 +25,7 @@
#include <linux/reboot.h>
#include <linux/irqchip.h>
#include <linux/clk-provider.h>
+#include <linux/tegra-soc.h>
#include <asm/hardware/cache-l2x0.h>
@@ -109,6 +110,7 @@ void __init tegra_init_early(void)
void __init tegra_init_late(void)
{
+ tegra_cpufreq_init();
tegra_init_suspend();
tegra_cpuidle_init();
tegra_powergate_debugfs_init();
@@ -253,7 +253,7 @@ static struct cpufreq_driver tegra_cpufreq_driver = {
.attr = tegra_cpufreq_attr,
};
-static int __init tegra_cpufreq_init(void)
+int __init tegra_cpufreq_init(void)
{
cpu_clk = clk_get_sys(NULL, "cclk");
if (IS_ERR(cpu_clk))
@@ -275,17 +275,8 @@ static int __init tegra_cpufreq_init(void)
return cpufreq_register_driver(&tegra_cpufreq_driver);
}
-
-static void __exit tegra_cpufreq_exit(void)
-{
- cpufreq_unregister_driver(&tegra_cpufreq_driver);
- clk_put(emc_clk);
- clk_put(cpu_clk);
-}
-
+EXPORT_SYMBOL(tegra_cpufreq_init);
MODULE_AUTHOR("Colin Cross <ccross@android.com>");
MODULE_DESCRIPTION("cpufreq driver for Nvidia Tegra2");
MODULE_LICENSE("GPL");
-module_init(tegra_cpufreq_init);
-module_exit(tegra_cpufreq_exit);
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, NVIDIA CORPORATION. All rights reserved.
+ * Copyright (c) 2012,2013, NVIDIA CORPORATION. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License,
@@ -19,4 +19,13 @@
u32 tegra_read_chipid(void);
+#ifdef CONFIG_ARM_TEGRA_CPUFREQ
+int tegra_cpufreq_init(void);
+#else
+static inline int tegra_cpufreq_init(void)
+{
+ return -EINVAL;
+}
+#endif
+
#endif /* __LINUX_TEGRA_SOC_H_ */
Move the call from module_init to Tegra machine codes so it won't be called in a multi-platform kernel running on non-Tegra SoCs. Signed-off-by: Bill Huang <bilhuang@nvidia.com> --- arch/arm/mach-tegra/common.c | 2 ++ drivers/cpufreq/tegra-cpufreq.c | 13 ++----------- include/linux/tegra-soc.h | 11 ++++++++++- 3 files changed, 14 insertions(+), 12 deletions(-)