Skip to contentSkip to conversation

Add RTC support

PATCH New Biju Das 4 participants 19 messages Jul 16, 2019 – Jul 23, 2019

Subsystems (4)
lore
Share & tools
lore

Biju Das

author
#0 lore raw

cover Add RTC support

This patch series add RTC support for iWave iwg23s sbc based on RZ/G1C.

This patch series is based on linux-4.4.y-cip and all the patches in this series are cherry-picked from linux rc tree.

This patch series depend on
https://patchwork.kernel.org/project/cip-dev/list/?series=146261

Alexandre Belloni (1):
rtc: pcf85363: add .max_register in regmap_config

Biju Das (6):
rtc: pcf85363: set time accurately
dt-bindings: rtc: pcf85363: Document pcf85263 real-time clock
rtc: pcf85363: Add support for NXP pcf85263 rtc
ARM: shmobile: Enable NXP pcf85363 rtc in shmobile_defconfig
ARM: multi_v7_defconfig: Enable NXP pcf85363 rtc
ARM: dts: iwg23s-sbc: Enable RTC

Eric Nelson (1):
rtc: add support for NXP PCF85363 real-time clock

Fabrizio Castro (2):
ARM: dts: r8a77470: Add I2C4 support
ARM: dts: r8a77470: Add I2C[0123] support

 Documentation/devicetree/bindings/rtc/pcf85363.txt |  17 ++
 arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts          |  18 ++
 arch/arm/boot/dts/r8a77470.dtsi                    |  68 ++++++
 arch/arm/configs/multi_v7_defconfig                |   1 +
 arch/arm/configs/shmobile_defconfig                |   1 +
 drivers/rtc/Kconfig                                |   9 +
 drivers/rtc/Makefile                               |   1 +
 drivers/rtc/rtc-pcf85363.c                         | 234 +++++++++++++++++++++
 8 files changed, 349 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/rtc/pcf85363.txt
 create mode 100644 drivers/rtc/rtc-pcf85363.c
Signature · 1 line
2.7.4
author
#1 lore raw

PATCH 1/10 rtc: add support for NXP PCF85363 real-time clock

From: Eric Nelson <[email protected]>

commit a9687aa2764dd2669602bd19dc636cbeef5293d5 upstream.

Note that alarms are not currently implemented.

64 bytes of nvmem is supported and exposed in sysfs (# is the instance number, starting with 0):

	/sys/bus/nvmem/devices/pcf85363-#/nvmem

[Removed rtc nvmem support. Added I2C ID table to rtc-pcf85363.c
Updated Kconfig description for rtc-pcf85363]

---
 Documentation/devicetree/bindings/rtc/pcf85363.txt |  17 ++
 drivers/rtc/Kconfig                                |   9 +
 drivers/rtc/Makefile                               |   1 +
 drivers/rtc/rtc-pcf85363.c                         | 197 +++++++++++++++++++++
 4 files changed, 224 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/rtc/pcf85363.txt
 create mode 100644 drivers/rtc/rtc-pcf85363.c
Documentation/devicetree/bindings/rtc/pcf85363.txt new file +17 -0
new file mode 100644
index 0000000..76fdabc
@@ -0,0 +1,17 @@
+NXP PCF85363 Real Time Clock
+============================
+
+Required properties:
+- compatible: Should contain "nxp,pcf85363".
+- reg: I2C address for chip.
+
+Optional properties:
+- interrupts: IRQ line for the RTC (not implemented).
+
+Example:
+
+pcf85363: pcf85363 at 51 {
+	compatible = "nxp,pcf85363";
+	reg = <0x51>;
+};
+
drivers/rtc/Kconfig +9 -0
index 2a52424..8f2fed5 100644
@@ -419,6 +419,15 @@ config RTC_DRV_PCF8523
 	  This driver can also be built as a module. If so, the module
 	  will be called rtc-pcf8523.
 
+config RTC_DRV_PCF85363
+	tristate "NXP PCF85363"
+	select REGMAP_I2C
+	help
+	  If you say yes here you get support for the PCF85363 RTC chip.
+
+	  This driver can also be built as a module. If so, the module
+	  will be called rtc-pcf85363.
+
 config RTC_DRV_PCF8563
 	tristate "Philips PCF8563/Epson RTC8564"
 	help
drivers/rtc/Makefile +1 -0
index 231f764..8419d5b 100644
@@ -109,6 +109,7 @@ obj-$(CONFIG_RTC_DRV_PCF2123)	+= rtc-pcf2123.o
 obj-$(CONFIG_RTC_DRV_PCF2127)	+= rtc-pcf2127.o
 obj-$(CONFIG_RTC_DRV_PCF50633)	+= rtc-pcf50633.o
 obj-$(CONFIG_RTC_DRV_PCF85063)	+= rtc-pcf85063.o
+obj-$(CONFIG_RTC_DRV_PCF85363)	+= rtc-pcf85363.o
 obj-$(CONFIG_RTC_DRV_PCF8523)	+= rtc-pcf8523.o
 obj-$(CONFIG_RTC_DRV_PCF8563)	+= rtc-pcf8563.o
 obj-$(CONFIG_RTC_DRV_PCF8583)	+= rtc-pcf8583.o
drivers/rtc/rtc-pcf85363.c new file +197 -0

197 lines not on this page · raw message

Signature · 1 line
2.7.4
#2 lore raw

PATCH 1/10 rtc: add support for NXP PCF85363 real-time clock

Quoted 11 lines · Biju Das

From: Eric Nelson <[email protected]>

commit a9687aa2764dd2669602bd19dc636cbeef5293d5 upstream.

Note that alarms are not currently implemented.

64 bytes of nvmem is supported and exposed in sysfs (# is the instance number, starting with 0):

	/sys/bus/nvmem/devices/pcf85363-#/nvmem

Just FYI, git does not like your whitespace:

Applying: rtc: add support for NXP PCF85363 real-time clock /data/pavel/cip/k/.git/rebase-apply/patch:32: new blank line at EOF. +

Best regards,
Pavel

Quoted 31 lines
 Documentation/devicetree/bindings/rtc/pcf85363.txt |  17 ++
 drivers/rtc/Kconfig                                |   9 +
 drivers/rtc/Makefile                               |   1 +
 drivers/rtc/rtc-pcf85363.c                         | 197 +++++++++++++++++++++
 4 files changed, 224 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/rtc/pcf85363.txt
 create mode 100644 drivers/rtc/rtc-pcf85363.c
Documentation/devicetree/bindings/rtc/pcf85363.txt new file +17 -0
new file mode 100644
index 0000000..76fdabc
@@ -0,0 +1,17 @@
+NXP PCF85363 Real Time Clock
+============================
+
+Required properties:
+- compatible: Should contain "nxp,pcf85363".
+- reg: I2C address for chip.
+
+Optional properties:
+- interrupts: IRQ line for the RTC (not implemented).
+
+Example:
+
+pcf85363: pcf85363 at 51 {
+	compatible = "nxp,pcf85363";
+	reg = <0x51>;
+};
+
Signature · 9 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://lists.cip-project.org/pipermail/cip-dev/attachments/20190717/af0c24f1/attachment.sig>
author
#3 lore raw

PATCH 2/10 rtc: pcf85363: add .max_register in regmap_config

In reply to Biju Das

From: Alexandre Belloni <[email protected]>

commit c57849dde003db3e21d33eab906dba2202f9294e upstream.

This helps debugging as it allows reading registers from debugfs.

---
 drivers/rtc/rtc-pcf85363.c | 1 +
 1 file changed, 1 insertion(+)
drivers/rtc/rtc-pcf85363.c +1 -0
index 54fc1a7..5fbc6df 100644
@@ -139,6 +139,7 @@ static const struct rtc_class_ops rtc_ops = {
 static const struct regmap_config regmap_config = {
 	.reg_bits = 8,
 	.val_bits = 8,
+	.max_register = 0x7f,
 };
 
 static int pcf85363_probe(struct i2c_client *client,
Signature · 1 line
2.7.4
author
#4 lore raw

PATCH 3/10 rtc: pcf85363: set time accurately

In reply to Biju Das

commit 188306ac9536ec47674ffa9dd330f69927679aeb upstream.

As per 8.2.6 Setting and reading the time in RTC mode, first stop the clok, then reset it before setting the date and time registers. Finally, start the clock.

This uses register address wrap around from 0x2f to 0x00 for efficiency.

This allows to set the clock with a millisecond accuracy (drift is not corrected in this example):

RTC System
1325388767 1325388767.000029180
1325388768 1325388768.000018362
1325388769 1325388769.000006544
1325388770 1325388769.999992725
1325388771 1325388770.999974544

---
 drivers/rtc/rtc-pcf85363.c | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)
drivers/rtc/rtc-pcf85363.c +16 -4
index 5fbc6df..dc57a6f 100644
@@ -73,6 +73,10 @@
 #define CTRL_RESETS	0x2f
 #define CTRL_RAM	0x40
 
+#define STOP_EN_STOP	BIT(0)
+
+#define RESET_CPR	0xa4
+
 #define NVRAM_SIZE	0x40
 
 static struct i2c_driver pcf85363_driver;
@@ -115,8 +119,12 @@ static int pcf85363_rtc_read_time(struct device *dev, struct rtc_time *tm)
 static int pcf85363_rtc_set_time(struct device *dev, struct rtc_time *tm)
 {
 	struct pcf85363 *pcf85363 = dev_get_drvdata(dev);
-	unsigned char buf[DT_YEARS + 1];
-	int len = sizeof(buf);
+	unsigned char tmp[11];
+	unsigned char *buf = &tmp[2];
+	int ret;
+
+	tmp[0] = STOP_EN_STOP;
+	tmp[1] = RESET_CPR;
 
 	buf[DT_100THS] = 0;
 	buf[DT_SECS] = bin2bcd(tm->tm_sec);
@@ -127,8 +135,12 @@ static int pcf85363_rtc_set_time(struct device *dev, struct rtc_time *tm)
 	buf[DT_MONTHS] = bin2bcd(tm->tm_mon + 1);
 	buf[DT_YEARS] = bin2bcd(tm->tm_year % 100);
 
-	return regmap_bulk_write(pcf85363->regmap, DT_100THS,
-				 buf, len);
+	ret = regmap_bulk_write(pcf85363->regmap, CTRL_STOP_EN,
+				tmp, sizeof(tmp));
+	if (ret)
+		return ret;
+
+	return regmap_write(pcf85363->regmap, CTRL_STOP_EN, 0);
 }
 
 static const struct rtc_class_ops rtc_ops = {
Signature · 1 line
2.7.4
#5 lore raw

PATCH 3/10 rtc: pcf85363: set time accurately

Quoted 8 lines · Biju Das

commit 188306ac9536ec47674ffa9dd330f69927679aeb upstream.

As per 8.2.6 Setting and reading the time in RTC mode, first stop the clok, then reset it before setting the date and time registers. Finally, start the clock.

This uses register address wrap around from 0x2f to 0x00 for efficiency.

How does wrap around work? AFAICT it is supposed to have ram at 0x40.

Does it really provide increased efficiency (given regmap layer in between) and will such trick cause problems in future? If regmap is not aware of register mirrors it might get confused and provide stale values, for example...

Best regards,
Pavel

Signature · 9 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://lists.cip-project.org/pipermail/cip-dev/attachments/20190716/f24183ef/attachment.sig>
author
#6 lore raw

PATCH 3/10 rtc: pcf85363: set time accurately

Hi Pavel,

Thanks for the feedback.

Quoted 11 lines

-----Original Message-----
From: Pavel Machek <[email protected]>
Sent: Tuesday, July 16, 2019 10:04 PM
To: Biju Das <[email protected]>
Cc: cip-dev at lists.cip-project.org
Subject: Re: [cip-dev] [PATCH 4.4.y-cip 03/10] rtc: pcf85363: set time accurately

Quoted 2 lines · Biju Das

commit 188306ac9536ec47674ffa9dd330f69927679aeb upstream.

Quoted 9 lines
Quoted 6 lines

As per 8.2.6 Setting and reading the time in RTC mode, first stop the clok, then reset it before setting the date and time registers. Finally, start the clock.

This uses register address wrap around from 0x2f to 0x00 for efficiency.

How does wrap around work? AFAICT it is supposed to have ram at 0x40.

Please see the document [1] and [2] section 8, that have the details related to wrap around.
[1] https://www.nxp.com/docs/en/data-sheet/PCF85363A.pdf
[2] https://www.nxp.com/docs/en/data-sheet/PCF85263A.pdf

Regards,
Biju

Quoted 11 lines

Does it really provide increased efficiency (given regmap layer in between) and will such trick cause problems in future? If regmap is not aware of register mirrors it might get confused and provide stale values, for example...

Best regards,
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures)
http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

#7 lore raw

PATCH 3/10 rtc: pcf85363: set time accurately

Quoted 19 lines · Biju Das

Hi Pavel,

Thanks for the feedback.

Quoted 15 lines

-----Original Message-----
From: Pavel Machek <[email protected]>
Sent: Tuesday, July 16, 2019 10:04 PM
To: Biju Das <[email protected]>
Cc: cip-dev at lists.cip-project.org
Subject: Re: [cip-dev] [PATCH 4.4.y-cip 03/10] rtc: pcf85363: set time accurately

Quoted 6 lines · Biju Das

commit 188306ac9536ec47674ffa9dd330f69927679aeb upstream.

As per 8.2.6 Setting and reading the time in RTC mode, first stop the clok, then reset it before setting the date and time registers. Finally, start the clock.

Quoted 8 lines
Quoted 5 lines
Quoted 2 lines

This uses register address wrap around from 0x2f to 0x00 for efficiency.

How does wrap around work? AFAICT it is supposed to have ram at 0x40.

Please see the document [1] and [2] section 8, that have the details related to wrap around.
[1] https://www.nxp.com/docs/en/data-sheet/PCF85363A.pdf
[2] https://www.nxp.com/docs/en/data-sheet/PCF85263A.pdf

Regardless of what the hardware does...

Quoted 4 lines
Quoted 4 lines

Does it really provide increased efficiency (given regmap layer in between) and will such trick cause problems in future? If regmap is not aware of register mirrors it might get confused and provide stale values, for example...

...I think Pavel is right on this point. regmap doesn't seem to have any provision for register addresses wrapping around, and it looks like this causes a buffer overrun in the register cache.

Ben.

Signature · 3 lines
Ben Hutchings, Software Developer                         Codethink Ltd
https://www.codethink.co.uk/                 Dale House, 35 Dale Street
                                     Manchester, M1 2HF, United Kingdom
author
#8 lore raw

PATCH 4/10 dt-bindings: rtc: pcf85363: Document pcf85263 real-time clock

In reply to Biju Das

commit bae5e94bea188e652d798eeb4b92b88a355591f6 upstream.

The pcf85263 RTC is compatible with the pcf85363 RTC.

The difference between the pcf85263 and pcf85363 RTC is that the latter has 64 bytes more RAM. This renders them incompatible from a DT point of view.

---
 Documentation/devicetree/bindings/rtc/pcf85363.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/rtc/pcf85363.txt +2 -2
index 76fdabc..94adc1c 100644
@@ -1,8 +1,8 @@
-NXP PCF85363 Real Time Clock
+NXP PCF85263/PCF85363 Real Time Clock
 ============================
 
 Required properties:
-- compatible: Should contain "nxp,pcf85363".
+- compatible: Should contain "nxp,pcf85263" or "nxp,pcf85363".
 - reg: I2C address for chip.
 
 Optional properties:
Signature · 1 line
2.7.4
author
#9 lore raw

PATCH 5/10 rtc: pcf85363: Add support for NXP pcf85263 rtc

In reply to Biju Das

commit fc979933bcf162595b6004d0de4effb64c323152 upstream.

Add support for NXP pcf85263 real-time clock. pcf85263 rtc is compatible with pcf85363,except that pcf85363 has additional 64 bytes of RAM.

1 byte of nvmem is supported and exposed in sysfs (# is the instance number,starting with 0): /sys/bus/nvmem/devices/pcf85x63-#/nvmem

[ Removed rtc nvmem support. Added I2C ID table for rtc-pcf85263 ]
---
 drivers/rtc/rtc-pcf85363.c | 40 ++++++++++++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 8 deletions(-)
drivers/rtc/rtc-pcf85363.c +32 -8
index dc57a6f..64217f1 100644
@@ -87,6 +87,11 @@ struct pcf85363 {
 	struct regmap		*regmap;
 };
 
+struct pcf85x63_config {
+	struct regmap_config regmap;
+	unsigned int num_nvram;
+};
+
 static int pcf85363_rtc_read_time(struct device *dev, struct rtc_time *tm)
 {
 	struct pcf85363 *pcf85363 = dev_get_drvdata(dev);
@@ -148,16 +153,33 @@ static const struct rtc_class_ops rtc_ops = {
 	.set_time	= pcf85363_rtc_set_time,
 };
 
-static const struct regmap_config regmap_config = {
-	.reg_bits = 8,
-	.val_bits = 8,
-	.max_register = 0x7f,
+static const struct pcf85x63_config pcf_85263_config = {
+	.regmap = {
+		.reg_bits = 8,
+		.val_bits = 8,
+		.max_register = 0x2f,
+	},
+	.num_nvram = 1
+};
+
+static const struct pcf85x63_config pcf_85363_config = {
+	.regmap = {
+		.reg_bits = 8,
+		.val_bits = 8,
+		.max_register = 0x7f,
+	},
+	.num_nvram = 2
 };
 
 static int pcf85363_probe(struct i2c_client *client,
 			  const struct i2c_device_id *id)
 {
 	struct pcf85363 *pcf85363;
+	const struct pcf85x63_config *config = &pcf_85363_config;
+	const void *data = of_device_get_match_data(&client->dev);
+
+	if (data)
+		config = data;
 
 	if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C))
 		return -ENODEV;
@@ -167,7 +189,7 @@ static int pcf85363_probe(struct i2c_client *client,
 	if (!pcf85363)
 		return -ENOMEM;
 
-	pcf85363->regmap = devm_regmap_init_i2c(client, &regmap_config);
+	pcf85363->regmap = devm_regmap_init_i2c(client, &config->regmap);
 	if (IS_ERR(pcf85363->regmap)) {
 		dev_err(&client->dev, "regmap allocation failed\n");
 		return PTR_ERR(pcf85363->regmap);
@@ -185,12 +207,14 @@ static int pcf85363_probe(struct i2c_client *client,
 
 static const struct i2c_device_id pcf85363_id[] = {
 	{ "pcf85363", 0 },
+	{ "pcf85263", 0 },
 	{ }
 };
 
 static const struct of_device_id dev_ids[] = {
-	{ .compatible = "nxp,pcf85363" },
-	{}
+	{ .compatible = "nxp,pcf85263", .data = &pcf_85263_config },
+	{ .compatible = "nxp,pcf85363", .data = &pcf_85363_config },
+	{ /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, dev_ids);
 
@@ -206,5 +230,5 @@ static struct i2c_driver pcf85363_driver = {
 module_i2c_driver(pcf85363_driver);
 
 MODULE_AUTHOR("Eric Nelson");
-MODULE_DESCRIPTION("pcf85363 I2C RTC driver");
+MODULE_DESCRIPTION("pcf85263/pcf85363 I2C RTC driver");
 MODULE_LICENSE("GPL");
Signature · 1 line
2.7.4
#10 lore raw

PATCH 5/10 rtc: pcf85363: Add support for NXP pcf85263 rtc

Hi,

Quoted 11 lines

-----Original Message-----
From: cip-dev-bounces at lists.cip-project.org [mailto:cip-dev-bounces at lists.cip-project.org] On Behalf Of Biju Das
Sent: Tuesday, July 16, 2019 5:15 PM
To: cip-dev at lists.cip-project.org
Cc: Biju Das <[email protected]>
Subject: [cip-dev] [PATCH 4.4.y-cip 05/10] rtc: pcf85363: Add support for NXP pcf85263 rtc

commit fc979933bcf162595b6004d0de4effb64c323152 upstream.

Quoted 8 lines

Add support for NXP pcf85263 real-time clock. pcf85263 rtc is compatible with pcf85363,except that pcf85363 has additional 64 bytes of RAM.

1 byte of nvmem is supported and exposed in sysfs (# is the instance number,starting with 0): /sys/bus/nvmem/devices/pcf85x63-#/nvmem

support. Added I2C ID table for rtc-pcf85263 ]

You've deleted Alexandre's Signed-off-by tag from original patch.

Best regards,
Nobuhiro

Quoted 102 lines
---
 drivers/rtc/rtc-pcf85363.c | 40
++++++++++++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 8 deletions(-)
drivers/rtc/rtc-pcf85363.c +28 -5
index dc57a6f..64217f1 100644
@@ -87,6 +87,11 @@ struct pcf85363 {
 	struct regmap		*regmap;
 };
 
+struct pcf85x63_config {
+	struct regmap_config regmap;
+	unsigned int num_nvram;
+};
+
 static int pcf85363_rtc_read_time(struct device *dev, struct rtc_time
 *tm)  {
 	struct pcf85363 *pcf85363 = dev_get_drvdata(dev); @@ -148,16
+153,33 @@ static const struct rtc_class_ops rtc_ops = {
 	.set_time	= pcf85363_rtc_set_time,
 };
 
-static const struct regmap_config regmap_config = {
-	.reg_bits = 8,
-	.val_bits = 8,
-	.max_register = 0x7f,
+static const struct pcf85x63_config pcf_85263_config = {
+	.regmap = {
+		.reg_bits = 8,
+		.val_bits = 8,
+		.max_register = 0x2f,
+	},
+	.num_nvram = 1
+};
+
+static const struct pcf85x63_config pcf_85363_config = {
+	.regmap = {
+		.reg_bits = 8,
+		.val_bits = 8,
+		.max_register = 0x7f,
+	},
+	.num_nvram = 2
 };
 
 static int pcf85363_probe(struct i2c_client *client,
 			  const struct i2c_device_id *id)
 {
 	struct pcf85363 *pcf85363;
+	const struct pcf85x63_config *config = &pcf_85363_config;
+	const void *data = of_device_get_match_data(&client->dev);
+
+	if (data)
+		config = data;
 
 	if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C))
 		return -ENODEV;
@@ -167,7 +189,7 @@ static int pcf85363_probe(struct i2c_client *client,
 	if (!pcf85363)
 		return -ENOMEM;
 
-	pcf85363->regmap = devm_regmap_init_i2c(client,
 &regmap_config);
+	pcf85363->regmap = devm_regmap_init_i2c(client,
 &config->regmap);
 	if (IS_ERR(pcf85363->regmap)) {
drivers/rtc/rtc-pcf85363.c +5 -4
 		dev_err(&client->dev, "regmap allocation failed\n");
 		return PTR_ERR(pcf85363->regmap);
@@ -185,12 +207,14 @@ static int pcf85363_probe(struct i2c_client
 *client,
 
 static const struct i2c_device_id pcf85363_id[] = {
 	{ "pcf85363", 0 },
+	{ "pcf85263", 0 },
 	{ }
 };
 
 static const struct of_device_id dev_ids[] = {
-	{ .compatible = "nxp,pcf85363" },
-	{}
+	{ .compatible = "nxp,pcf85263", .data = &pcf_85263_config },
+	{ .compatible = "nxp,pcf85363", .data = &pcf_85363_config },
+	{ /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, dev_ids);
@@ -206,5 +230,5 @@ static struct i2c_driver pcf85363_driver =
 {  module_i2c_driver(pcf85363_driver);
 
 MODULE_AUTHOR("Eric Nelson");
-MODULE_DESCRIPTION("pcf85363 I2C RTC driver");
+MODULE_DESCRIPTION("pcf85263/pcf85363 I2C RTC driver");
 MODULE_LICENSE("GPL");
--

2.7.4

_______________________________________________
cip-dev mailing list
cip-dev at lists.cip-project.org
https://lists.cip-project.org/mailman/listinfo/cip-dev

author
#11 lore raw

PATCH 5/10 rtc: pcf85363: Add support for NXP pcf85263 rtc

Hi Nobuhiro,

Thanks for the feedback.

Quoted 20 lines

Subject: RE: [cip-dev] [PATCH 4.4.y-cip 05/10] rtc: pcf85363: Add support for NXP pcf85263 rtc

Hi,

Quoted 9 lines

-----Original Message-----
From: cip-dev-bounces at lists.cip-project.org [mailto:cip-dev-bounces at lists.cip-project.org] On Behalf Of Biju Das
Sent: Tuesday, July 16, 2019 5:15 PM
To: cip-dev at lists.cip-project.org
Cc: Biju Das <[email protected]>
Subject: [cip-dev] [PATCH 4.4.y-cip 05/10] rtc: pcf85363: Add support for NXP pcf85263 rtc

Quoted 4 lines

commit fc979933bcf162595b6004d0de4effb64c323152 upstream.

Add support for NXP pcf85263 real-time clock. pcf85263 rtc is compatible with pcf85363,except that pcf85363 has additional 64 bytes of

RAM.

Quoted 1 line
Quoted 7 lines
Quoted 5 lines

1 byte of nvmem is supported and exposed in sysfs (# is the instance number,starting with 0): /sys/bus/nvmem/devices/pcf85x63-#/nvmem

support. Added I2C ID table for rtc-pcf85263 ]

You've deleted Alexandre's Signed-off-by tag from original patch.

Thanks for pointing this out. It is a mistake. Can you please fix this while applying to the tree?

Or

Do you want me to send another patch fixing this? Please let me know.

Regards,
Biju

[>]

Quoted 102 lines
Quoted 102 lines
---
 drivers/rtc/rtc-pcf85363.c | 40
++++++++++++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 8 deletions(-)
drivers/rtc/rtc-pcf85363.c +28 -5
index dc57a6f..64217f1 100644
@@ -87,6 +87,11 @@ struct pcf85363 {
 	struct regmap		*regmap;
 };
 
+struct pcf85x63_config {
+	struct regmap_config regmap;
+	unsigned int num_nvram;
+};
+
 static int pcf85363_rtc_read_time(struct device *dev, struct rtc_time
 *tm)  {
 	struct pcf85363 *pcf85363 = dev_get_drvdata(dev); @@ -148,16
+153,33 @@ static const struct rtc_class_ops rtc_ops = {
 	.set_time	= pcf85363_rtc_set_time,
 };
 
-static const struct regmap_config regmap_config = {
-	.reg_bits = 8,
-	.val_bits = 8,
-	.max_register = 0x7f,
+static const struct pcf85x63_config pcf_85263_config = {
+	.regmap = {
+		.reg_bits = 8,
+		.val_bits = 8,
+		.max_register = 0x2f,
+	},
+	.num_nvram = 1
+};
+
+static const struct pcf85x63_config pcf_85363_config = {
+	.regmap = {
+		.reg_bits = 8,
+		.val_bits = 8,
+		.max_register = 0x7f,
+	},
+	.num_nvram = 2
 };
 
 static int pcf85363_probe(struct i2c_client *client,
 			  const struct i2c_device_id *id)
 {
 	struct pcf85363 *pcf85363;
+	const struct pcf85x63_config *config = &pcf_85363_config;
+	const void *data = of_device_get_match_data(&client->dev);
+
+	if (data)
+		config = data;
 
 	if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C))
 		return -ENODEV;
@@ -167,7 +189,7 @@ static int pcf85363_probe(struct i2c_client *client,
 	if (!pcf85363)
 		return -ENOMEM;
 
-	pcf85363->regmap = devm_regmap_init_i2c(client,
 &regmap_config);
+	pcf85363->regmap = devm_regmap_init_i2c(client,
 &config->regmap);
 	if (IS_ERR(pcf85363->regmap)) {
drivers/rtc/rtc-pcf85363.c +5 -4
 		dev_err(&client->dev, "regmap allocation failed\n");
 		return PTR_ERR(pcf85363->regmap);
@@ -185,12 +207,14 @@ static int pcf85363_probe(struct i2c_client
 *client,
 
 static const struct i2c_device_id pcf85363_id[] = {
 	{ "pcf85363", 0 },
+	{ "pcf85263", 0 },
 	{ }
 };
 
 static const struct of_device_id dev_ids[] = {
-	{ .compatible = "nxp,pcf85363" },
-	{}
+	{ .compatible = "nxp,pcf85263", .data = &pcf_85263_config },
+	{ .compatible = "nxp,pcf85363", .data = &pcf_85363_config },
+	{ /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, dev_ids);
@@ -206,5 +230,5 @@ static struct i2c_driver pcf85363_driver = {
 module_i2c_driver(pcf85363_driver);
 
 MODULE_AUTHOR("Eric Nelson");
-MODULE_DESCRIPTION("pcf85363 I2C RTC driver");
+MODULE_DESCRIPTION("pcf85263/pcf85363 I2C RTC driver");
 MODULE_LICENSE("GPL");
--

2.7.4

_______________________________________________
cip-dev mailing list
cip-dev at lists.cip-project.org
https://lists.cip-project.org/mailman/listinfo/cip-dev

#12 lore raw

PATCH 5/10 rtc: pcf85363: Add support for NXP pcf85263 rtc

Hi,

Quoted 39 lines

-----Original Message-----
From: Biju Das [mailto:biju.das at bp.renesas.com]
Sent: Wednesday, July 17, 2019 4:16 PM
To: iwamatsu nobuhiro(?? ?? ????????) <[email protected]>; cip-dev at lists.cip-project.org
Subject: RE: [cip-dev] [PATCH 4.4.y-cip 05/10] rtc: pcf85363: Add support for NXP pcf85263 rtc

Hi Nobuhiro,

Thanks for the feedback.

Quoted 27 lines

Subject: RE: [cip-dev] [PATCH 4.4.y-cip 05/10] rtc: pcf85363: Add support for NXP pcf85263 rtc

Hi,

Quoted 9 lines

-----Original Message-----
From: cip-dev-bounces at lists.cip-project.org [mailto:cip-dev-bounces at lists.cip-project.org] On Behalf Of Biju Das
Sent: Tuesday, July 16, 2019 5:15 PM
To: cip-dev at lists.cip-project.org
Cc: Biju Das <[email protected]>
Subject: [cip-dev] [PATCH 4.4.y-cip 05/10] rtc: pcf85363: Add support for NXP pcf85263 rtc

Quoted 5 lines

commit fc979933bcf162595b6004d0de4effb64c323152 upstream.

Add support for NXP pcf85263 real-time clock. pcf85263 rtc is compatible with pcf85363,except that pcf85363 has additional 64 bytes of

RAM.

Quoted 6 lines

1 byte of nvmem is supported and exposed in sysfs (# is the instance number,starting with 0): /sys/bus/nvmem/devices/pcf85x63-#/nvmem

nvmem support. Added I2C ID table for rtc-pcf85263 ]

Quoted 9 lines
Quoted 1 line

You've deleted Alexandre's Signed-off-by tag from original patch.

Thanks for pointing this out. It is a mistake. Can you please fix this while applying to the tree?

Or

Do you want me to send another patch fixing this? Please let me know.

Pavel applied this patch with signed-off-by tag. Thanks Pavel.

Best regards,
Nobuhiro

author
#13 lore raw

PATCH 6/10 ARM: dts: r8a77470: Add I2C4 support

In reply to Biju Das

From: Fabrizio Castro <[email protected]>

commit 3578859661975f8ccb9d8d49c97784d5ff5467df upstream.

Add I2C4 support to RZ/G1C (a.k.a. r8a77470) SoC specific device tree.

[Reworked clocks and power-domains properties. Removed resets properties]
---
 arch/arm/boot/dts/r8a77470.dtsi | 12 ++++++++++++
 1 file changed, 12 insertions(+)
arch/arm/boot/dts/r8a77470.dtsi +12 -0
index a10afa2..7b3c4a2 100644
@@ -211,6 +211,18 @@
 			reg = <0 0xe6300000 0 0x20000>;
 		};
 
+		i2c4: i2c at e6520000 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			compatible = "renesas,i2c-r8a77470",
+				     "renesas,rcar-gen2-i2c";
+			reg = <0 0xe6520000 0 0x40>;
+			interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&mstp9_clks R8A77470_CLK_I2C4>;
+			power-domains = <&cpg_clocks>;
+			status = "disabled";
+		};
+
 		dmac0: dma-controller at e6700000 {
 			compatible = "renesas,dmac-r8a77470",
 				     "renesas,rcar-dmac";
Signature · 1 line
2.7.4
author
#14 lore raw

PATCH 7/10 ARM: dts: r8a77470: Add I2C[0123] support

In reply to Biju Das

From: Fabrizio Castro <[email protected]>

commit 4f94af57237ad1c9c6328b468fd8fbbd19c2fb78 upstream.

Add device tree nodes for the I2C[0123] controllers. Also, add the aliases node.

[Reworked clocks and power-domains properties. Removed resets properties]
---
 arch/arm/boot/dts/r8a77470.dtsi | 56 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
arch/arm/boot/dts/r8a77470.dtsi +56 -0
index 7b3c4a2..524bba6 100644
@@ -14,6 +14,14 @@
 	#address-cells = <2>;
 	#size-cells = <2>;
 
+	aliases {
+		i2c0 = &i2c0;
+		i2c1 = &i2c1;
+		i2c2 = &i2c2;
+		i2c3 = &i2c3;
+		i2c4 = &i2c4;
+	};
+
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
@@ -211,6 +219,54 @@
 			reg = <0 0xe6300000 0 0x20000>;
 		};
 
+		i2c0: i2c at e6508000 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			compatible = "renesas,i2c-r8a77470",
+				     "renesas,rcar-gen2-i2c";
+			reg = <0 0xe6508000 0 0x40>;
+			interrupts = <GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&mstp9_clks R8A77470_CLK_I2C0>;
+			power-domains = <&cpg_clocks>;
+			status = "disabled";
+		};
+
+		i2c1: i2c at e6518000 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			compatible = "renesas,i2c-r8a77470",
+				     "renesas,rcar-gen2-i2c";
+			reg = <0 0xe6518000 0 0x40>;
+			interrupts = <GIC_SPI 288 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&mstp9_clks R8A77470_CLK_I2C1>;
+			power-domains = <&cpg_clocks>;
+			status = "disabled";
+		};
+
+		i2c2: i2c at e6530000 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			compatible = "renesas,i2c-r8a77470",
+				     "renesas,rcar-gen2-i2c";
+			reg = <0 0xe6530000 0 0x40>;
+			interrupts = <GIC_SPI 286 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&mstp9_clks R8A77470_CLK_I2C2>;
+			power-domains = <&cpg_clocks>;
+			status = "disabled";
+		};
+
+		i2c3: i2c at e6540000 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			compatible = "renesas,i2c-r8a77470",
+				     "renesas,rcar-gen2-i2c";
+			reg = <0 0xe6540000 0 0x40>;
+			interrupts = <GIC_SPI 290 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&mstp9_clks R8A77470_CLK_I2C3>;
+			power-domains = <&cpg_clocks>;
+			status = "disabled";
+		};
+
 		i2c4: i2c at e6520000 {
 			#address-cells = <1>;
 			#size-cells = <0>;
Signature · 1 line
2.7.4
author
#15 lore raw

PATCH 8/10 ARM: shmobile: Enable NXP pcf85363 rtc in shmobile_defconfig

In reply to Biju Das

commit 71e3039dd7c377118608321d6c1f2ecb35da4c17 upstream.

The iWave RZ/G1C SBC supports RTC (NXP pcf85263). To increase hardware support enable the driver in the shmobile_defconfig multiplatform configuration.

---
 arch/arm/configs/shmobile_defconfig | 1 +
 1 file changed, 1 insertion(+)
arch/arm/configs/shmobile_defconfig +1 -0
index 4770cd8..4074631 100644
@@ -188,6 +188,7 @@ CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_GPIO=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_RS5C372=y
+CONFIG_RTC_DRV_PCF85363=y
 CONFIG_RTC_DRV_BQ32K=y
 CONFIG_RTC_DRV_S35390A=y
 CONFIG_RTC_DRV_RX8581=y
Signature · 1 line
2.7.4
author
#16 lore raw

PATCH 9/10 ARM: multi_v7_defconfig: Enable NXP pcf85363 rtc

In reply to Biju Das

commit e5168ec09d993d2b64cd9ee8d4cff269e53538be upstream.

The iWave RZ/G1C SBC supports RTC (NXP pcf85263). To increase hardware support enable the driver in the multi_v7_defconfig multiplatform configuration.

---
 arch/arm/configs/multi_v7_defconfig | 1 +
 1 file changed, 1 insertion(+)
arch/arm/configs/multi_v7_defconfig +1 -0
index cfaf564..a3ba031 100644
@@ -608,6 +608,7 @@ CONFIG_RTC_DRV_MAX77686=y
 CONFIG_RTC_DRV_RK808=m
 CONFIG_RTC_DRV_MAX77802=m
 CONFIG_RTC_DRV_RS5C372=m
+CONFIG_RTC_DRV_PCF85363=m
 CONFIG_RTC_DRV_BQ32K=m
 CONFIG_RTC_DRV_PALMAS=y
 CONFIG_RTC_DRV_ST_LPC=y
Signature · 1 line
2.7.4
author
#17 lore raw

PATCH 10/10 ARM: dts: iwg23s-sbc: Enable RTC

In reply to Biju Das

commit 55327bff832c9903a9133cdad56783b54bd8596a upstream.

Enable NXP pcf85263 real time clock for the iWave SBC based on RZ/G1C.

---
 arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts +18 -0
index 48b168d..fea316d 100644
@@ -48,12 +48,30 @@
 	clock-frequency = <20000000>;
 };
 
+&i2c3 {
+	pinctrl-0 = <&i2c3_pins>;
+	pinctrl-names = "default";
+
+	status = "okay";
+	clock-frequency = <400000>;
+
+	rtc at 51 {
+		compatible = "nxp,pcf85263";
+		reg = <0x51>;
+	};
+};
+
 &pfc {
 	avb_pins: avb {
 		groups = "avb_mdio", "avb_gmii_tx_rx";
 		function = "avb";
 	};
 
+	i2c3_pins: i2c3 {
+		groups = "i2c3_c";
+		function = "i2c3";
+	};
+
 	qspi0_pins: qspi0 {
 		groups = "qspi0_ctrl", "qspi0_data2";
 		function = "qspi0";
Signature · 1 line
2.7.4
#18 lore raw

cover Add RTC support

In reply to Biju Das

Hi!

Quoted 4 lines

This patch series add RTC support for iWave iwg23s sbc based on RZ/G1C.

This patch series is based on linux-4.4.y-cip and all the patches in this series are cherry-picked from linux rc tree.

I have add Signed-off-by: in 5/10 and applied the series.

Best regards,
Pavel

Signature · 9 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://lists.cip-project.org/pipermail/cip-dev/attachments/20190717/f4c5b071/attachment.sig>