drivers/rtc/rtc-pl031.c: restore ST variant functionality
authorLinus Walleij <linus.walleij@linaro.org>
Tue, 12 Feb 2013 21:46:19 +0000 (13:46 -0800)
committerBen Hutchings <ben@decadent.org.uk>
Wed, 6 Mar 2013 03:23:55 +0000 (03:23 +0000)
commit7366b52c44b46c073a4bf1285ca09ca6ce5d9b39
tree18bc58149025b32882d8cbfd983c472cc0fee1b5
parent24bc276d78799da0c2ed5ea1c46bf4ac8f1a0a9e
drivers/rtc/rtc-pl031.c: restore ST variant functionality

commit 3399cfb5df9594495b876d1843a7165f77366b2b upstream.

Commit e7e034e18a0a ("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>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/rtc/rtc-pl031.c