From 4e5126452c35ed81d137f86799d3f9050d35aed9 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Tue, 12 Feb 2013 13:46:19 -0800 Subject: [PATCH] --- yaml --- r: 349700 b: refs/heads/master c: 3399cfb5df9594495b876d1843a7165f77366b2b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/rtc/rtc-pl031.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b47aa2429e59..52591151c1cf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 211b0cdc7dc574e5e756bdf1cc2f4a16b7f6e07e +refs/heads/master: 3399cfb5df9594495b876d1843a7165f77366b2b diff --git a/trunk/drivers/rtc/rtc-pl031.c b/trunk/drivers/rtc/rtc-pl031.c index 10c1a3454e48..81c5077feff3 100644 --- a/trunk/drivers/rtc/rtc-pl031.c +++ b/trunk/drivers/rtc/rtc-pl031.c @@ -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