aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/clockdomain.c
diff options
context:
space:
mode:
authorAbhijit Pagare <abhijitpagare@ti.com>2010-02-23 00:09:07 -0500
committerPaul Walmsley <paul@pwsan.com>2010-02-24 14:14:59 -0500
commit91808a81fe7cc8a786b575ebc2d102c59d83c1a7 (patch)
treed02f38f8fc1bd4c4fe6c6cdcf9770e6231da79d1 /arch/arm/mach-omap2/clockdomain.c
parenta7e069fc5a560c096a2597d7be27f45fb4a01df7 (diff)
ARM: OMAP4 clock domain: Add check for avoiding dependency related update.
A check is added for avoiding the sleep/wakeup dependency updates for OMAP4 as the structures for the dependencies are currently absent. Signed-off-by: Abhijit Pagare <abhijitpagare@ti.com> [paul@pwsan.com: added warnings, explanatory comment, copyright update] Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/mach-omap2/clockdomain.c')
-rw-r--r--arch/arm/mach-omap2/clockdomain.c30
1 files changed, 24 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/clockdomain.c b/arch/arm/mach-omap2/clockdomain.c
index a38a615b422f..de4278c19029 100644
--- a/arch/arm/mach-omap2/clockdomain.c
+++ b/arch/arm/mach-omap2/clockdomain.c
@@ -1,8 +1,8 @@
1/* 1/*
2 * OMAP2/3/4 clockdomain framework functions 2 * OMAP2/3/4 clockdomain framework functions
3 * 3 *
4 * Copyright (C) 2008-2009 Texas Instruments, Inc. 4 * Copyright (C) 2008-2010 Texas Instruments, Inc.
5 * Copyright (C) 2008-2009 Nokia Corporation 5 * Copyright (C) 2008-2010 Nokia Corporation
6 * 6 *
7 * Written by Paul Walmsley and Jouni Högander 7 * Written by Paul Walmsley and Jouni Högander
8 * Added OMAP4 specific support by Abhijit Pagare <abhijitpagare@ti.com> 8 * Added OMAP4 specific support by Abhijit Pagare <abhijitpagare@ti.com>
@@ -891,8 +891,17 @@ void omap2_clkdm_allow_idle(struct clockdomain *clkdm)
891 pr_debug("clockdomain: enabling automatic idle transitions for %s\n", 891 pr_debug("clockdomain: enabling automatic idle transitions for %s\n",
892 clkdm->name); 892 clkdm->name);
893 893
894 if (atomic_read(&clkdm->usecount) > 0) 894 /*
895 _clkdm_add_autodeps(clkdm); 895 * XXX This should be removed once TI adds wakeup/sleep
896 * dependency code and data for OMAP4.
897 */
898 if (cpu_is_omap44xx()) {
899 WARN_ONCE(1, "clockdomain: OMAP4 wakeup/sleep dependency "
900 "support is not yet implemented\n");
901 } else {
902 if (atomic_read(&clkdm->usecount) > 0)
903 _clkdm_add_autodeps(clkdm);
904 }
896 905
897 _omap2_clkdm_set_hwsup(clkdm, 1); 906 _omap2_clkdm_set_hwsup(clkdm, 1);
898 907
@@ -924,8 +933,17 @@ void omap2_clkdm_deny_idle(struct clockdomain *clkdm)
924 933
925 _omap2_clkdm_set_hwsup(clkdm, 0); 934 _omap2_clkdm_set_hwsup(clkdm, 0);
926 935
927 if (atomic_read(&clkdm->usecount) > 0) 936 /*
928 _clkdm_del_autodeps(clkdm); 937 * XXX This should be removed once TI adds wakeup/sleep
938 * dependency code and data for OMAP4.
939 */
940 if (cpu_is_omap44xx()) {
941 WARN_ONCE(1, "clockdomain: OMAP4 wakeup/sleep dependency "
942 "support is not yet implemented\n");
943 } else {
944 if (atomic_read(&clkdm->usecount) > 0)
945 _clkdm_del_autodeps(clkdm);
946 }
929} 947}
930 948
931 949