summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSuman Anna2015-05-27 16:50:16 -0500
committerAngela Stegmaier2015-06-25 11:23:34 -0500
commit4c385320c23781cf03d4e2a5caea0f5f1f33bfa7 (patch)
treefeb0ed89892f39e4623708273946103c7bb8ca9f
parentac4fd0b81969cf6d0ae192ed5217a31f1adf0818 (diff)
downloadkernel-video-glsdk-7.01.00.03.tar.gz
kernel-video-glsdk-7.01.00.03.tar.xz
kernel-video-glsdk-7.01.00.03.zip
Revert "ARM: OMAP: DRA7: change IPU1 clk domain to SWSUP for proper boot"glsdk-7.01.00.03
This reverts commit 6d6dd44c55638d54a151bf2ae6cc77b2f4e459d0. The commit 6d6dd44c5563 ("ARM: OMAP: DRA7: change IPU1 clk domain to SWSUP for proper boot") switched the IPU1 clock domain to SWSUP only to resolve an IPU1 boot issue. However, this solution worked only because of another pre-existing bug in the omap_hwmod code, wherein a usage count for the hwmod parent clockdomain was incremented during omap_device_deassert_hardreset() and was never balanced, causing the clockdomain to always remain on and never allowing the corresponding power domain to enter a low power state. This eliminated the pre-condition for the IPU1 boot issue. The bug in omap_hwmod layer was resolved by commit e1d52c6d4ff7 ("ARM: OMAP2+: hwmod: fix deassert hardreset clkdm usecounting"), and this resulted in the recurrence of the IPU1 boot issue on some platforms. The IPU1 boot issue has now been resolved by restricting the target power domain state to ON during the power-up of the MMU and allowing RET or a lower power state only when the MMU and the corresponding parent remoteproc is suspended (system or runtime suspend). So revert back to the default expected HWSUP mode for the IPU1 clock domain. Change-Id: Id6d219f4d275c2c1f34e478c8303fb3181aa6553 Signed-off-by: Suman Anna <s-anna@ti.com>
-rw-r--r--arch/arm/mach-omap2/clockdomains7xx_data.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/clockdomains7xx_data.c b/arch/arm/mach-omap2/clockdomains7xx_data.c
index 7a28ad40a04..b3cbd09e21e 100644
--- a/arch/arm/mach-omap2/clockdomains7xx_data.c
+++ b/arch/arm/mach-omap2/clockdomains7xx_data.c
@@ -373,7 +373,7 @@ static struct clockdomain ipu1_7xx_clkdm = {
373 .dep_bit = DRA7XX_IPU1_STATDEP_SHIFT, 373 .dep_bit = DRA7XX_IPU1_STATDEP_SHIFT,
374 .wkdep_srcs = ipu1_wkup_sleep_deps, 374 .wkdep_srcs = ipu1_wkup_sleep_deps,
375 .sleepdep_srcs = ipu1_wkup_sleep_deps, 375 .sleepdep_srcs = ipu1_wkup_sleep_deps,
376 .flags = CLKDM_CAN_SWSUP, 376 .flags = CLKDM_CAN_HWSUP_SWSUP,
377}; 377};
378 378
379static struct clockdomain ipu2_7xx_clkdm = { 379static struct clockdomain ipu2_7xx_clkdm = {