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

Commit 532db570 authored by Tony Prisk's avatar Tony Prisk Committed by Linus Torvalds
Browse files

drivers/rtc/rtc-vt8500.c: correct handling of CR_24H bitfield 



Control register bitfield for 12H/24H mode is handled incorrectly.
Setting CR_24H actually enables 12H mode.  This patch renames the define
and changes the initialization code to correctly set 24H mode.

Signed-off-by: default avatarTony Prisk <linux@prisktech.co.nz>
Cc: Edgar Toernig <froese@gmx.de>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent dc59ed38

drivers/rtc/rtc-vt8500.c

+2 −2
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ 
				| ALARM_SEC_BIT)



#define VT8500_RTC_CR_ENABLE	(1 << 0)	/* Enable RTC */

#define VT8500_RTC_CR_24H	(1 << 1)	/* 24h time format */

#define VT8500_RTC_CR_12H	(1 << 1)	/* 12h time format */

#define VT8500_RTC_CR_SM_ENABLE	(1 << 2)	/* Enable periodic irqs */

#define VT8500_RTC_CR_SM_SEC	(1 << 3)	/* 0: 1Hz/60, 1: 1Hz */

#define VT8500_RTC_CR_CALIB	(1 << 4)	/* Enable calibration */
@@ -247,7 +247,7 @@ static int vt8500_rtc_probe(struct platform_device *pdev) 
	}



	/* Enable RTC and set it to 24-hour mode */

	writel(VT8500_RTC_CR_ENABLE | VT8500_RTC_CR_24H,

	writel(VT8500_RTC_CR_ENABLE,

	       vt8500_rtc->regbase + VT8500_RTC_CR);



	vt8500_rtc->rtc = rtc_device_register("vt8500-rtc", &pdev->dev,