aboutsummaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2016-04-13 12:31:47 -0700
committerTony Lindgren <tony@atomide.com>2016-04-13 12:31:47 -0700
commite2567075be35e98472411fcea233713df997ef5b (patch)
tree372d455f0ef99d058379d8583196b6ef6ebc0634 /arch/arm
parent19e831b272e6db5884be085be66e44da975c73a9 (diff)
parent1cbabcb9807e31e87ef3a12af76ea025ceb582d3 (diff)
downloadleg-kernel-e2567075be35e98472411fcea233713df997ef5b.tar.gz
Merge tag 'for-v4.6-rc/omap-fixes-b' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v4.6/fixes
ARM: OMAP2+: clockdomain: another fix for v4.6-rc For DRA7xx platforms, add a workaround for missed timer interrupts that appears to be due to an integration bug (erratum i874) Basic build, boot, and PM test logs are available here: http://www.pwsan.com/omap/testlogs/omap-fixes-b-for-v4.6-rc/20160413020850/ (The DRA7xx board here has not yet been added into the testbed.)
Diffstat (limited to 'arch/arm')
-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 7581e036bda6..ef9ed36e8a61 100644
--- a/arch/arm/mach-omap2/clockdomains7xx_data.c
+++ b/arch/arm/mach-omap2/clockdomains7xx_data.c
@@ -461,7 +461,7 @@ static struct clockdomain ipu_7xx_clkdm = {
.cm_inst = DRA7XX_CM_CORE_AON_IPU_INST,
.clkdm_offs = DRA7XX_CM_CORE_AON_IPU_IPU_CDOFFS,
.dep_bit = DRA7XX_IPU_STATDEP_SHIFT,
- .flags = CLKDM_CAN_HWSUP_SWSUP,
+ .flags = CLKDM_CAN_SWSUP,
};
static struct clockdomain mpu1_7xx_clkdm = {