Patchwork [1/3] rtc: twl: Enable RTC irrespective of its prior state

login
register
mail settings
Submitter Venu Byravarasu
Date Jan. 19, 2012, 10:12 a.m.
Message ID <1326967949-8248-2-git-send-email-vbyravarasu@nvidia.com>
Download mbox | patch
Permalink /patch/136801/
State New
Headers show

Comments

Venu Byravarasu - Jan. 19, 2012, 10:12 a.m.
From: Venu Byravarasu <vbyravarasu@nvidia.com>

As part of probe, before enabling RTC, RTC_CTRL register is read
to check if it is already running. If RTC is used by kernel alone,
then this read is not required. Even if RTC was enabled already by
boot loader, setting STOP_RTC bit again should not harm.
Hence removed unwanted read operation.

Signed-off-by: Venu Byravarasu <vbyravarasu@nvidia.com>
---
 drivers/rtc/rtc-twl.c |   12 ++----------
 1 files changed, 2 insertions(+), 10 deletions(-)

Patch

diff --git a/drivers/rtc/rtc-twl.c b/drivers/rtc/rtc-twl.c
index 20687d5..61ae1b7 100644
--- a/drivers/rtc/rtc-twl.c
+++ b/drivers/rtc/rtc-twl.c
@@ -449,19 +449,11 @@  static int __devinit twl_rtc_probe(struct platform_device *pdev)
 			REG_INT_MSK_STS_A);
 	}
 
-	/* Check RTC module status, Enable if it is off */
-	ret = twl_rtc_read_u8(&rd_reg, REG_RTC_CTRL_REG);
+	dev_info(&pdev->dev, "Enabling TWL-RTC\n");
+	ret = twl_rtc_write_u8(BIT_RTC_CTRL_REG_STOP_RTC_M, REG_RTC_CTRL_REG);
 	if (ret < 0)
 		goto out1;
 
-	if (!(rd_reg & BIT_RTC_CTRL_REG_STOP_RTC_M)) {
-		dev_info(&pdev->dev, "Enabling TWL-RTC.\n");
-		rd_reg = BIT_RTC_CTRL_REG_STOP_RTC_M;
-		ret = twl_rtc_write_u8(rd_reg, REG_RTC_CTRL_REG);
-		if (ret < 0)
-			goto out1;
-	}
-
 	/* init cached IRQ enable bits */
 	ret = twl_rtc_read_u8(&rtc_irq_bits, REG_RTC_INTERRUPTS_REG);
 	if (ret < 0)