diff mbox series

[v2,1/2] rtc: ds1307: Detect oscillator fail on mcp794xx

Message ID 20240611072411.671600-1-csokas.bence@prolan.hu
State Accepted
Headers show
Series [v2,1/2] rtc: ds1307: Detect oscillator fail on mcp794xx | expand

Commit Message

Csókás Bence June 11, 2024, 7:24 a.m. UTC 
This patch enables the detection of the oscillator failure on mcp794xx chips.

Co-developed-by: Szentendrei, Tamás <szentendrei.tamas@prolan.hu>
Signed-off-by: Szentendrei, Tamás <szentendrei.tamas@prolan.hu>
Signed-off-by: Csókás, Bence <csokas.bence@prolan.hu>
---
 drivers/rtc/rtc-ds1307.c | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Alexandre Belloni July 6, 2024, 10:34 p.m. UTC | #1 
On Tue, 11 Jun 2024 09:24:08 +0200, Csókás, Bence wrote:
> This patch enables the detection of the oscillator failure on mcp794xx chips.
> 
> Co-developed-by:
> Signed-off-by:
> Signed-off-by:
> 

Applied, thanks!

[1/2] rtc: ds1307: Detect oscillator fail on mcp794xx
      https://git.kernel.org/abelloni/c/5ea60ba8007d
[2/2] rtc: ds1307: Clamp year to valid BCD (0-99) in `set_time()`
      https://git.kernel.org/abelloni/c/f825a15fc8ce

Best regards,
diff mbox series

Patch

diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
index 506b7d1c2397..bdb7b201a160 100644
--- a/drivers/rtc/rtc-ds1307.c
+++ b/drivers/rtc/rtc-ds1307.c
@@ -65,6 +65,7 @@  enum ds_type {
 #	define DS1340_BIT_CENTURY_EN	0x80	/* in REG_HOUR */
 #	define DS1340_BIT_CENTURY	0x40	/* in REG_HOUR */
 #define DS1307_REG_WDAY		0x03	/* 01-07 */
+#	define MCP794XX_BIT_OSCRUN	BIT(5)
 #	define MCP794XX_BIT_VBATEN	0x08
 #define DS1307_REG_MDAY		0x04	/* 01-31 */
 #define DS1307_REG_MONTH	0x05	/* 01-12 */
@@ -242,6 +243,10 @@  static int ds1307_get_time(struct device *dev, struct rtc_time *t)
 	    regs[DS1307_REG_MIN] & M41T0_BIT_OF) {
 		dev_warn_once(dev, "oscillator failed, set time!\n");
 		return -EINVAL;
+	} else if (ds1307->type == mcp794xx &&
+	    !(regs[DS1307_REG_WDAY] & MCP794XX_BIT_OSCRUN)) {
+		dev_warn_once(dev, "oscillator failed, set time!\n");
+		return -EINVAL;
 	}
 
 	tmp = regs[DS1307_REG_SECS];