From: Alexandre Belloni <alexandre.belloni@bootlin.com>
To: linux-rtc@vger.kernel.org
Cc: linux-kernel@vger.kernel.org,
Alexandre Belloni <alexandre.belloni@bootlin.com>
Subject: [PATCH 09/12] rtc: pcf85063: Add Micro Crystal RV8263 support
Date: Mon, 1 Apr 2019 18:08:13 +0200 [thread overview]
Message-ID: <20190401160816.17859-9-alexandre.belloni@bootlin.com> (raw)
In-Reply-To: <20190401160816.17859-1-alexandre.belloni@bootlin.com>
The Micro Crystal RV8263 has the same IC as the pcf85063 but has an on
board crystal. This means that the CAP_SEL bit has to be cleared so the
correct capacitance is selected for the crystal.
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
---
.../devicetree/bindings/rtc/nxp,pcf85063.txt | 3 +-
drivers/rtc/rtc-pcf85063.c | 32 ++++++++++++++++---
2 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/Documentation/devicetree/bindings/rtc/nxp,pcf85063.txt b/Documentation/devicetree/bindings/rtc/nxp,pcf85063.txt
index 1e31afbfffe9..627bb533eff7 100644
--- a/Documentation/devicetree/bindings/rtc/nxp,pcf85063.txt
+++ b/Documentation/devicetree/bindings/rtc/nxp,pcf85063.txt
@@ -4,7 +4,8 @@ Required properties:
- compatible: Should one of contain:
"nxp,pcf85063",
"nxp,pcf85063a",
- "nxp,pcf85063tp"
+ "nxp,pcf85063tp",
+ "microcrystal,rv8263"
- reg: I2C address for chip.
Optional property:
diff --git a/drivers/rtc/rtc-pcf85063.c b/drivers/rtc/rtc-pcf85063.c
index 536db43c84ee..0ac763c10744 100644
--- a/drivers/rtc/rtc-pcf85063.c
+++ b/drivers/rtc/rtc-pcf85063.c
@@ -5,6 +5,9 @@
*
* Author: Søren Andersen <san@rosetechnology.dk>
* Maintainers: http://www.nslu2-linux.org/
+ *
+ * Copyright (C) 2019 Micro Crystal AG
+ * Author: Alexandre Belloni <alexandre.belloni@bootlin.com>
*/
#include <linux/i2c.h>
#include <linux/bcd.h>
@@ -22,7 +25,10 @@
*
* PCF85063A -- Rev. 6 — 18 November 2015
* PCF85063TP -- Rev. 4 — 6 May 2015
-*/
+ *
+ * https://www.microcrystal.com/fileadmin/Media/Products/RTC/App.Manual/RV-8263-C7_App-Manual.pdf
+ * RV8263 -- Rev. 1.0 — January 2019
+ */
#define PCF85063_REG_CTRL1 0x00 /* status */
#define PCF85063_REG_CTRL1_CAP_SEL BIT(0)
@@ -41,6 +47,7 @@
struct pcf85063_config {
struct regmap_config regmap;
unsigned has_alarms:1;
+ unsigned force_cap_7000:1;
};
struct pcf85063 {
@@ -230,12 +237,17 @@ static const struct rtc_class_ops pcf85063_rtc_ops_alarm = {
};
static int pcf85063_load_capacitance(struct pcf85063 *pcf85063,
- const struct device_node *np)
+ const struct device_node *np,
+ unsigned int force_cap)
{
u32 load = 7000;
u8 reg = 0;
- of_property_read_u32(np, "quartz-load-femtofarads", &load);
+ if (force_cap)
+ load = force_cap;
+ else
+ of_property_read_u32(np, "quartz-load-femtofarads", &load);
+
switch (load) {
default:
dev_warn(&pcf85063->rtc->dev, "Unknown quartz-load-femtofarads value: %d. Assuming 7000",
@@ -269,6 +281,16 @@ static const struct pcf85063_config pcf85063tp_config = {
},
};
+static const struct pcf85063_config rv8263_config = {
+ .regmap = {
+ .reg_bits = 8,
+ .val_bits = 8,
+ .max_register = 0x11,
+ },
+ .has_alarms = 1,
+ .force_cap_7000 = 1,
+};
+
static int pcf85063_probe(struct i2c_client *client)
{
struct pcf85063 *pcf85063;
@@ -303,7 +325,8 @@ static int pcf85063_probe(struct i2c_client *client)
if (IS_ERR(pcf85063->rtc))
return PTR_ERR(pcf85063->rtc);
- err = pcf85063_load_capacitance(pcf85063, client->dev.of_node);
+ err = pcf85063_load_capacitance(pcf85063, client->dev.of_node,
+ config->force_cap_7000 ? 7000 : 0);
if (err < 0)
dev_warn(&client->dev, "failed to set xtal load capacitance: %d",
err);
@@ -339,6 +362,7 @@ static const struct of_device_id pcf85063_of_match[] = {
{ .compatible = "nxp,pcf85063", .data = &pcf85063tp_config },
{ .compatible = "nxp,pcf85063tp", .data = &pcf85063tp_config },
{ .compatible = "nxp,pcf85063a", .data = &pcf85063a_config },
+ { .compatible = "microcrystal,rv8263", .data = &rv8263_config },
{}
};
MODULE_DEVICE_TABLE(of, pcf85063_of_match);
--
2.20.1
next prev parent reply other threads:[~2019-04-01 16:09 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-01 16:08 [PATCH 01/12] rtc: pcf85063: switch to probe_new Alexandre Belloni
2019-04-01 16:08 ` [PATCH 02/12] rtc: pcf85063: convert to SPDX identifier Alexandre Belloni
2019-04-01 16:16 ` Joe Perches
2019-04-01 16:29 ` Alexandre Belloni
2019-04-01 16:33 ` [PATCH v2 " Alexandre Belloni
2019-04-01 16:08 ` [PATCH 03/12] rtc: pcf85063: remove bogus i2c functionality check Alexandre Belloni
2019-04-01 16:08 ` [PATCH 04/12] rtc: pcf85063: convert to devm_rtc_allocate_device Alexandre Belloni
2019-04-01 16:08 ` [PATCH 05/12] rtc: pcf85063: set range Alexandre Belloni
2019-04-01 16:08 ` [PATCH 06/12] rtc: pcf85063: switch to regmap Alexandre Belloni
2019-04-01 16:08 ` [PATCH 07/12] rtc: pcf85063: differentiate pcf85063a and pcf85063tp Alexandre Belloni
2019-04-01 16:08 ` [PATCH 08/12] rtc: pcf85063: add alarm support Alexandre Belloni
2019-04-01 16:08 ` Alexandre Belloni [this message]
2019-04-01 16:08 ` [PATCH 10/12] rtc: pcf85063: add nvram support Alexandre Belloni
2019-04-01 16:08 ` [PATCH 11/12] rtc: pcf85063: add offset correction support Alexandre Belloni
2019-04-01 16:08 ` [PATCH 12/12] rtc: pcf85063: add RTC_VL_READ/RTC_VL_CLR support 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=20190401160816.17859-9-alexandre.belloni@bootlin.com \
--to=alexandre.belloni@bootlin.com \
--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).