Skip to content

Commit

Permalink
nuc900/rtc: change the waiting for device ready implement
Browse files Browse the repository at this point in the history
- add an mdelay(1) to the polling loop to cause less frequent access to
  the hardware register.

- change the return value from ENODEV to EPERM if the loop timed out.  I
  think the 'Operation not permitted' description is more suitable for the
  meaning of 'check_rtc_access_enable()' function, it just be used to
  judge rtc access operation is permitted or not.

Signed-off-by: Wan ZongShun <[email protected]>
Cc: Alessandro Zummo <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
zswan authored and torvalds committed Aug 11, 2010
1 parent 5fc79d8 commit 0a89b55
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions drivers/rtc/rtc-nuc900.c
Original file line number Diff line number Diff line change
Expand Up @@ -85,22 +85,21 @@ static irqreturn_t nuc900_rtc_interrupt(int irq, void *_rtc)

static int *check_rtc_access_enable(struct nuc900_rtc *nuc900_rtc)
{
unsigned int i;
unsigned int i, timeout = 0x1000;
__raw_writel(INIRRESET, nuc900_rtc->rtc_reg + REG_RTC_INIR);

mdelay(10);

__raw_writel(AERPOWERON, nuc900_rtc->rtc_reg + REG_RTC_AER);

for (i = 0; i < 1000; i++) {
if (__raw_readl(nuc900_rtc->rtc_reg + REG_RTC_AER) & AERRWENB)
return 0;
}
while (!(__raw_readl(nuc900_rtc->rtc_reg + REG_RTC_AER) & AERRWENB)
&& timeout--)
mdelay(1);

if ((__raw_readl(nuc900_rtc->rtc_reg + REG_RTC_AER) & AERRWENB) == 0x0)
return ERR_PTR(-ENODEV);
if (!timeout)
return ERR_PTR(-EPERM);

return ERR_PTR(-EPERM);
return 0;
}

static void nuc900_rtc_bcd2bin(unsigned int timereg,
Expand Down

0 comments on commit 0a89b55

Please sign in to comment.