summaryrefslogtreecommitdiff
path: root/arch/arm/mach-davinci/psc.c
diff options
context:
space:
mode:
authorSekhar Nori <nsekhar@ti.com>2011-07-06 06:01:22 (GMT)
committerSekhar Nori <nsekhar@ti.com>2011-07-08 05:40:09 (GMT)
commitaad70de20fc69970a3080e7e8f02b54a4a3fe3e6 (patch)
tree2b6564f263d1741d2824e7b8af2d22be6e4a23c8 /arch/arm/mach-davinci/psc.c
parenta51ca38b6330e463cc1a7adf64502ff735452915 (diff)
downloadlinux-aad70de20fc69970a3080e7e8f02b54a4a3fe3e6.tar.xz
davinci: enable forced transitions on PSC
Some DaVinci modules like the SATA on DA850 need forced module state transitions. Define a "force" flag which can be passed to the PSC config function to enable it to make forced transitions. Forced transitions shouldn't normally be attempted, unless the TRM explicitly specifies its usage. ChangeLog: v2: Modified to take care of the fact that davinci_psc_config() now takes the flags directly. Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Diffstat (limited to 'arch/arm/mach-davinci/psc.c')
-rw-r--r--arch/arm/mach-davinci/psc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/psc.c b/arch/arm/mach-davinci/psc.c
index 823cb1b..1fb6bdf 100644
--- a/arch/arm/mach-davinci/psc.c
+++ b/arch/arm/mach-davinci/psc.c
@@ -75,6 +75,8 @@ void davinci_psc_config(unsigned int domain, unsigned int ctlr,
mdctl = __raw_readl(psc_base + MDCTL + 4 * id);
mdctl &= ~MDSTAT_STATE_MASK;
mdctl |= next_state;
+ if (flags & PSC_FORCE)
+ mdctl |= MDCTL_FORCE;
__raw_writel(mdctl, psc_base + MDCTL + 4 * id);
pdstat = __raw_readl(psc_base + PDSTAT);