diff options
| author | Chandrakanth Gorantla <cgorantla@nvidia.com> | 2012-02-15 14:41:58 +0530 |
|---|---|---|
| committer | Rohan Somvanshi <rsomvanshi@nvidia.com> | 2012-02-17 07:42:17 -0800 |
| commit | 7108e0a05e1d07996d7c3ba9835ce57f7a1f7e77 (patch) | |
| tree | 69efe56721dbf60f1aeb5eaa97da5e15747ab357 | |
| parent | 3ad2eea7ad71171ec06eb6835459116a2e0794d2 (diff) | |
Revert "arm: tegra3: change min_rate for sclk"
This reverts commit a61ef84d7746134aae316fa76867d69fc0753880.
Bug 939415
Change-Id: I7d7c2a69ac7261a221cf69b8f8981d42f575f789
Signed-off-by: Chandrakanth Gorantla <cgorantla@nvidia.com>
Reviewed-on: http://git-master/r/84025
Reviewed-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
Tested-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
| -rw-r--r-- | arch/arm/mach-tegra/common.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/pm.c | 33 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/tegra3_clocks.c | 3 |
3 files changed, 1 insertions, 36 deletions
diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c index ae18a18623f9..4c685fd8f097 100644 --- a/arch/arm/mach-tegra/common.c +++ b/arch/arm/mach-tegra/common.c @@ -157,7 +157,6 @@ static __initdata struct tegra_clk_init_table common_clk_init_table[] = { { "sclk", "pll_p_out4", 102000000, true }, { "hclk", "sclk", 102000000, true }, { "pclk", "hclk", 51000000, true }, - { "wake.sclk", NULL, 40000000, true }, #endif #else { "pll_p", NULL, 216000000, true }, diff --git a/arch/arm/mach-tegra/pm.c b/arch/arm/mach-tegra/pm.c index 98903f7365ee..bd0775328d75 100644 --- a/arch/arm/mach-tegra/pm.c +++ b/arch/arm/mach-tegra/pm.c @@ -33,7 +33,6 @@ #include <linux/debugfs.h> #include <linux/delay.h> #include <linux/suspend.h> -#include <linux/earlysuspend.h> #include <linux/slab.h> #include <linux/serial_reg.h> #include <linux/seq_file.h> @@ -1278,35 +1277,3 @@ static int tegra_debug_uart_syscore_init(void) return 0; } arch_initcall(tegra_debug_uart_syscore_init); - -#ifdef CONFIG_HAS_EARLYSUSPEND -static struct clk *clk_wake; - -static void pm_early_suspend(struct early_suspend *h) -{ - if (clk_wake) - clk_disable(clk_wake); - pm_qos_update_request(&awake_cpu_freq_req, PM_QOS_DEFAULT_VALUE); -} - -static void pm_late_resume(struct early_suspend *h) -{ - if (clk_wake) - clk_enable(clk_wake); - pm_qos_update_request(&awake_cpu_freq_req, (s32)AWAKE_CPU_FREQ_MIN); -} - -static struct early_suspend pm_early_suspender = { - .suspend = pm_early_suspend, - .resume = pm_late_resume, -}; - -static int pm_init_wake_behavior(void) -{ - clk_wake = tegra_get_clock_by_name("wake.sclk"); - register_early_suspend(&pm_early_suspender); - return 0; -} - -late_initcall(pm_init_wake_behavior); -#endif diff --git a/arch/arm/mach-tegra/tegra3_clocks.c b/arch/arm/mach-tegra/tegra3_clocks.c index bbdf191ccd6d..d3abcb265c50 100644 --- a/arch/arm/mach-tegra/tegra3_clocks.c +++ b/arch/arm/mach-tegra/tegra3_clocks.c @@ -3873,7 +3873,7 @@ static struct clk tegra_clk_sclk = { .reg = 0x28, .ops = &tegra_super_ops, .max_rate = 334000000, - .min_rate = 12000000, + .min_rate = 40000000, }; static struct clk tegra_clk_virtual_cpu_g = { @@ -4277,7 +4277,6 @@ struct clk tegra_list_clks[] = { SHARED_CLK("usb1.sclk", "tegra-ehci.0", "sclk", &tegra_clk_sbus_cmplx, NULL, 0, 0), SHARED_CLK("usb2.sclk", "tegra-ehci.1", "sclk", &tegra_clk_sbus_cmplx, NULL, 0, 0), SHARED_CLK("usb3.sclk", "tegra-ehci.2", "sclk", &tegra_clk_sbus_cmplx, NULL, 0, 0), - SHARED_CLK("wake.sclk", "wake_sclk", "sclk", &tegra_clk_sbus_cmplx, NULL, 0, 0), SHARED_CLK("mon.avp", "tegra_actmon", "avp", &tegra_clk_sbus_cmplx, NULL, 0, 0), SHARED_CLK("cap.sclk", "cap_sclk", NULL, &tegra_clk_sbus_cmplx, NULL, 0, SHARED_CEILING), SHARED_CLK("floor.sclk", "floor_sclk", NULL, &tegra_clk_sbus_cmplx, NULL, 0, 0), |