The patch titled
Subject: drivers/rtc/rtc-pl031.c: restore ST variant functionality
has been removed from the -mm tree. Its filename was
drivers-rtc-rtc-pl031c-restore-st-variant-functionality.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Linus Walleij <linus.walleij@xxxxxxxxxx>
Subject: drivers/rtc/rtc-pl031.c: restore ST variant functionality
e7e034e18a0ab ("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 real
bad way.
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxx>
Acked-by: Haojian Zhuang <haojian.zhuang@xxxxxxxxx>
Cc: Mian Yousaf KAUKAB <mian.yousaf.kaukab@xxxxxxxxxxxxxx>
Cc: Srinidhi Kasagar <srinidhi.kasagar@xxxxxxxxxxxxxx>
Cc: Alessandro Zummo <a.zummo@xxxxxxxxxxxx>
Cc: <stable@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/rtc/rtc-pl031.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff -puN drivers/rtc/rtc-pl031.c~drivers-rtc-rtc-pl031c-restore-st-variant-functionality drivers/rtc/rtc-pl031.c
--- a/drivers/rtc/rtc-pl031.c~drivers-rtc-rtc-pl031c-restore-st-variant-functionality
+++ a/drivers/rtc/rtc-pl031.c
@@ -350,7 +350,9 @@ static int pl031_probe(struct amba_devic
/* 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
_
Patches currently in -mm which might be from linus.walleij@xxxxxxxxxx are
origin.patch
linux-next.patch
rtc-pl031-add-wake-up-support.patch
gpio-convert-to-idr_alloc.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
