Commit 3399cfb5 authored Feb 12, 2013 by Linus Walleij Committed by Linus Torvalds Feb 12, 2013

drivers/rtc/rtc-pl031.c: restore ST variant functionality



Commit e7e034e1 ("drivers/rtc/rtc-pl031.c: fix the missing operation
on enable") accidentally broke the ST variants of PL031.

The bit that is being poked as "clockwatch" enable bit for the ST
variants does the work of bit 0 on this variant.  Bit 0 is used for a
clock divider on the ST variants, and setting it to 1 will affect
timekeeping in a very bad way.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Cc: Mian Yousaf KAUKAB <mian.yousaf.kaukab@stericsson.com>
Cc: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 211b0cdc

drivers/rtc/rtc-pl031.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -350,7 +350,9 @@ static int pl031_probe(struct amba_device adev, const struct amba_id id)
		/* Enable the clockwatch on ST Variants */
		if (vendor->clockwatch)
		data \|= RTC_CR_CWEN;
		writel(data \| RTC_CR_EN, ldata->base + RTC_CR);
		else
		data \|= RTC_CR_EN;
		writel(data, ldata->base + RTC_CR);

		/*
		* On ST PL031 variants, the RTC reset value does not provide correct

Admin message