diff options
| author | Prashant Gaikwad <pgaikwad@nvidia.com> | 2011-06-10 14:09:10 +0530 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:47:39 -0800 |
| commit | 84d2c3d9ec21cb4d2b14e5925db45dd48dd75629 (patch) | |
| tree | c65e08138e0b8935c4646a9ea541e84c54872b5e /arch/arm/mach-tegra/tegra2_statmon.c | |
| parent | a6ea24cb910bed2dfa68376c22b8b176a3979881 (diff) | |
ARM: tegra: clocks: Add shared sclk for statmon
H/W statistics monitor for AVP controls sclk depending on load.
Instead of overriding avp.sclk rate, separate sclk client added
for statmon so that busy hints from AVP can be handled.
Bug 831892
Reviewed-on: http://git-master/r/36057
(cherry picked from commit a19f85a8a7af722bcfd729297e682574dc22de7b)
Original-Change-Id: I216ef8eac46ac0bfdd8d439b197f14af37720db3
Reviewed-on: http://git-master/r/39795
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>
Rebase-Id: Rbbc91472cf6dbadbe773fc72a9f1af4f96bd5af9
Diffstat (limited to 'arch/arm/mach-tegra/tegra2_statmon.c')
| -rw-r--r-- | arch/arm/mach-tegra/tegra2_statmon.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/tegra2_statmon.c b/arch/arm/mach-tegra/tegra2_statmon.c index 64de5a9b03cd..92f9b883f93d 100644 --- a/arch/arm/mach-tegra/tegra2_statmon.c +++ b/arch/arm/mach-tegra/tegra2_statmon.c @@ -243,12 +243,14 @@ void tegra2_statmon_stop(void) tegra2_stat_mon_write(reg_val, COP_MON_CTRL); clk_disable(stat_mon->stat_mon_clock); + clk_disable(stat_mon->avp_sampler.clock); } int tegra2_statmon_start(void) { u32 reg_val = 0; + clk_enable(stat_mon->avp_sampler.clock); clk_enable(stat_mon->stat_mon_clock); /* disable AVP monitor */ @@ -344,9 +346,9 @@ static int sampler_init(struct sampler *s) s->enable = false; s->sample_time = 9; - clock = tegra_get_clock_by_name("avp.sclk"); + clock = tegra_get_clock_by_name("mon.sclk"); if (IS_ERR(clock)) { - pr_err("%s: Couldn't get avp clock\n", __func__); + pr_err("%s: Couldn't get mon.sckl\n", __func__); return -1; } |