Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7439bcb authored by Venu Byravarasu's avatar Venu Byravarasu Committed by Linus Torvalds
Browse files

drivers/rtc/rtc-twl.c: enable RTC irrespective of its prior state 



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: default avatarVenu Byravarasu <vbyravarasu@nvidia.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ce9f6506

drivers/rtc/rtc-twl.c

+2 −10
Original line number Diff line number Diff line
@@ -457,19 +457,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)