From 1ae573231b98781eee9829c4746152e98fe9d862 Mon Sep 17 00:00:00 2001 From: Nicolas Kaiser Date: Mon, 25 Oct 2010 14:41:18 +0200 Subject: [PATCH] --- yaml --- r: 225981 b: refs/heads/master c: 1a07bfb5215e11227403f121097ed72187dc3241 h: refs/heads/master i: 225979: d51afcd059e5803d6c255c12099679fea545452e v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-davinci/psc.c | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index b3a2f69406e8..602277a35dec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ced98628bf6ca7705b2d06df9c71a80cd1cd49bb +refs/heads/master: 1a07bfb5215e11227403f121097ed72187dc3241 diff --git a/trunk/arch/arm/mach-davinci/psc.c b/trunk/arch/arm/mach-davinci/psc.c index 1b15dbd0a77b..a41580400701 100644 --- a/trunk/arch/arm/mach-davinci/psc.c +++ b/trunk/arch/arm/mach-davinci/psc.c @@ -83,20 +83,15 @@ void davinci_psc_config(unsigned int domain, unsigned int ctlr, pdctl1 = __raw_readl(psc_base + PDCTL1); pdctl1 |= 0x100; __raw_writel(pdctl1, psc_base + PDCTL1); - - do { - ptstat = __raw_readl(psc_base + - PTSTAT); - } while (!(((ptstat >> domain) & 1) == 0)); } else { ptcmd = 1 << domain; __raw_writel(ptcmd, psc_base + PTCMD); - - do { - ptstat = __raw_readl(psc_base + PTSTAT); - } while (!(((ptstat >> domain) & 1) == 0)); } + do { + ptstat = __raw_readl(psc_base + PTSTAT); + } while (!(((ptstat >> domain) & 1) == 0)); + do { mdstat = __raw_readl(psc_base + MDSTAT + 4 * id); } while (!((mdstat & MDSTAT_STATE_MASK) == next_state));