summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/clock.c
diff options
context:
space:
mode:
authorAlex Frid <afrid@nvidia.com>2012-01-24 22:56:03 -0800
committerRohan Somvanshi <rsomvanshi@nvidia.com>2012-02-03 05:18:16 -0800
commit3efb99cdbb351f014b7d521ede3a8988138ef231 (patch)
tree535ca692c2ff7585abddedc6c81d3031327fdf0c /arch/arm/mach-tegra/clock.c
parentb632a5e75e82af5928fc4795283ded4e61411112 (diff)
ARM: tegra: clock: Check usage policy when set cansleep
Check PLL usage policy when traversing clock tree for descendants of sleeping clock. Don't propagate cansleep attribute if parent is not allowed. Reviewed-on: http://git-master/r/77252 Change-Id: Ibe79888d378924f416f8458146b21d1bc3671f16 Signed-off-by: Alex Frid <afrid@nvidia.com> Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Reviewed-on: http://git-master/r/78028 Reviewed-by: Automatic_Commit_Validation_User
Diffstat (limited to 'arch/arm/mach-tegra/clock.c')
-rw-r--r--arch/arm/mach-tegra/clock.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/clock.c b/arch/arm/mach-tegra/clock.c
index 434e010ddbef..0e650d7c85f9 100644
--- a/arch/arm/mach-tegra/clock.c
+++ b/arch/arm/mach-tegra/clock.c
@@ -183,7 +183,8 @@ static void __clk_set_cansleep(struct clk *c)
if (!possible_parent && child->inputs) {
for (i = 0; child->inputs[i].input; i++) {
- if (child->inputs[i].input == c) {
+ if ((child->inputs[i].input == c) &&
+ tegra_clk_is_parent_allowed(child, c)) {
possible_parent = true;
break;
}