diff options
| author | Bengt Jonsson <bengt.g.jonsson@stericsson.com> | 2012-02-14 10:53:07 +0100 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:01:37 +0200 |
| commit | 88eb63ee79dafce5ba11e8559799454b1f542273 (patch) | |
| tree | c84326e194939f310cb96a23898b679f2288dcff | |
| parent | 22221424ee6bd9c279a11e02198935d57ebab4a6 (diff) | |
ab8500: rtc: Remove fix for AB8500 ED version
AB8500 ED (Early Drop) is no longer supported.
ST-Ericsson ID: 366316
ST-Ericsson Linux next: -
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: I51b860b71cf1485a202237a6962c89873b03add7
Signed-off-by: Bengt Jonsson <bengt.g.jonsson@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/49030
Reviewed-by: QABUILD
Reviewed-by: QATEST
Reviewed-by: Rabin VINCENT <rabin.vincent@stericsson.com>
| -rw-r--r-- | drivers/rtc/rtc-ab8500.c | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/drivers/rtc/rtc-ab8500.c b/drivers/rtc/rtc-ab8500.c index 587f593c17e..baae8548781 100644 --- a/drivers/rtc/rtc-ab8500.c +++ b/drivers/rtc/rtc-ab8500.c @@ -88,22 +88,17 @@ static int ab8500_rtc_read_time(struct device *dev, struct rtc_time *tm) if (retval < 0) return retval; - /* Early AB8500 chips will not clear the rtc read request bit */ - if (abx500_get_chip_id(dev) == 0) { - usleep_range(1000, 1000); - } else { - /* Wait for some cycles after enabling the rtc read in ab8500 */ - while (time_before(jiffies, timeout)) { - retval = abx500_get_register_interruptible(dev, - AB8500_RTC, AB8500_RTC_READ_REQ_REG, &value); - if (retval < 0) - return retval; - - if (!(value & RTC_READ_REQUEST)) - break; - - usleep_range(1000, 5000); - } + /* Wait for some cycles after enabling the rtc read in ab8500 */ + while (time_before(jiffies, timeout)) { + retval = abx500_get_register_interruptible(dev, + AB8500_RTC, AB8500_RTC_READ_REQ_REG, &value); + if (retval < 0) + return retval; + + if (!(value & RTC_READ_REQUEST)) + break; + + usleep_range(1000, 5000); } /* Read the Watchtime registers */ |