linux-rtc.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Chris Packham <chris.packham@alliedtelesis.co.nz>
To: a.zummo@towertech.it, alexandre.belloni@bootlin.com
Cc: linux-rtc@vger.kernel.org, linux-kernel@vger.kernel.org,
	John Collis <john.collis@alliedtelesis.co.nz>,
	Chris Packham <chris.packham@alliedtelesis.co.nz>
Subject: [PATCH] rtc: ds1307: check for oscillator fault on ds1388
Date: Thu,  7 Nov 2019 14:12:45 +1300	[thread overview]
Message-ID: <20191107011245.26796-1-chris.packham@alliedtelesis.co.nz> (raw)

Ensure that the oscillator is running and check the OSF bit for the
ds1388 variant. The FLAG and CONTROL registers are at a different
location to the other supported RTCs so this requires an extra case in
the existing switch statement.

Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
---
 drivers/rtc/rtc-ds1307.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
index 1f7e8aefc1eb..865c06347d0a 100644
--- a/drivers/rtc/rtc-ds1307.c
+++ b/drivers/rtc/rtc-ds1307.c
@@ -101,6 +101,10 @@ enum ds_type {
 #	define DS1337_BIT_A2I		0x02
 #	define DS1337_BIT_A1I		0x01
 #define DS1339_REG_ALARM1_SECS	0x07
+#define DS1388_REG_FLAG		0x0b
+#	define DS1388_BIT_OSF		0x80
+#define DS1388_REG_CONTROL	0x0c
+#	define DS1388_BIT_nEOSC		0x80
 
 #define DS13XX_TRICKLE_CHARGER_MAGIC	0xa0
 
@@ -1688,6 +1692,26 @@ static int ds1307_probe(struct i2c_client *client,
 		}
 		break;
 
+	case ds_1388:
+		err = regmap_bulk_read(ds1307->regmap, DS1388_REG_FLAG,
+				       regs, 2);
+		if (err) {
+			dev_dbg(ds1307->dev, "read error %d\n", err);
+			goto exit;
+		}
+
+		if (regs[1] & DS1388_BIT_nEOSC) {
+			regmap_write(ds1307->regmap, DS1388_REG_CONTROL,
+				     regs[1] & ~DS1388_BIT_nEOSC);
+		}
+
+		if (regs[0] & DS1388_BIT_OSF) {
+			regmap_write(ds1307->regmap, DS1388_REG_FLAG,
+				     regs[0]  & ~DS1388_BIT_OSF);
+			dev_warn(ds1307->dev, "SET TIME!\n");
+		}
+		break;
+
 	case rx_8025:
 		err = regmap_bulk_read(ds1307->regmap,
 				       RX8025_REG_CTRL1 << 4 | 0x08, regs, 2);
-- 
2.24.0


             reply	other threads:[~2019-11-07  1:13 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-07  1:12 Chris Packham [this message]
2019-11-07 10:24 ` [PATCH] rtc: ds1307: check for oscillator fault on ds1388 Alexandre Belloni

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191107011245.26796-1-chris.packham@alliedtelesis.co.nz \
    --to=chris.packham@alliedtelesis.co.nz \
    --cc=a.zummo@towertech.it \
    --cc=alexandre.belloni@bootlin.com \
    --cc=john.collis@alliedtelesis.co.nz \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-rtc@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).