From d758c085c10b0af0c96a7ce3dc367dbcddf03984 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Thu, 12 Apr 2012 12:49:16 -0700 Subject: [PATCH] --- yaml --- r: 299068 b: refs/heads/master c: 2f3972168353d355854d6381f1f360ce83b723e5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/rtc/rtc-pl031.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 210696ed9f3e..13ae774bd2fe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 41c93088127df2579e8ca64010929ec9e41d5543 +refs/heads/master: 2f3972168353d355854d6381f1f360ce83b723e5 diff --git a/trunk/drivers/rtc/rtc-pl031.c b/trunk/drivers/rtc/rtc-pl031.c index 692de7360e94..684ef4bbfce4 100644 --- a/trunk/drivers/rtc/rtc-pl031.c +++ b/trunk/drivers/rtc/rtc-pl031.c @@ -339,8 +339,7 @@ static int pl031_probe(struct amba_device *adev, const struct amba_id *id) dev_dbg(&adev->dev, "revision = 0x%01x\n", ldata->hw_revision); /* Enable the clockwatch on ST Variants */ - if ((ldata->hw_designer == AMBA_VENDOR_ST) && - (ldata->hw_revision > 1)) + if (ldata->hw_designer == AMBA_VENDOR_ST) writel(readl(ldata->base + RTC_CR) | RTC_CR_CWEN, ldata->base + RTC_CR);