Merge branch 'p-ti-android-3.8.y-video' master
authorSundar Raman <a0393242@ti.com>
Fri, 26 Jul 2013 21:32:39 +0000 (16:32 -0500)
committerSundar Raman <a0393242@ti.com>
Fri, 26 Jul 2013 21:32:39 +0000 (16:32 -0500)
arch/arm/mach-omap2/clockdomains54xx_data.c
arch/arm/mach-omap2/clockdomains7xx_data.c

index 1a3c69d2e14c8f63b1337150cf646a5204a18ffd..c0678ed61dd55f5b5aac26963117289efb05b188 100644 (file)
@@ -269,7 +269,7 @@ static struct clockdomain dss_54xx_clkdm = {
        .dep_bit          = OMAP54XX_DSS_STATDEP_SHIFT,
        .wkdep_srcs       = dss_wkup_sleep_deps,
        .sleepdep_srcs    = dss_wkup_sleep_deps,
-       .flags            = CLKDM_CAN_HWSUP_SWSUP,
+       .flags            = CLKDM_CAN_SWSUP,
 };
 
 static struct clockdomain dsp_54xx_clkdm = {
index a261f6fa51852622e5a5fa36a7244725bbac08dc..6379e5f25a2eda784271a37cebd405999a06d1e2 100644 (file)
@@ -553,7 +553,7 @@ static struct clockdomain dss_7xx_clkdm = {
        .dep_bit          = DRA7XX_DSS_STATDEP_SHIFT,
        .wkdep_srcs       = dss_wkup_sleep_deps,
        .sleepdep_srcs    = dss_wkup_sleep_deps,
-       .flags            = CLKDM_CAN_HWSUP_SWSUP,
+       .flags            = CLKDM_CAN_SWSUP,
 };
 
 static struct clockdomain emif_7xx_clkdm = {