* [PATCH v7 0/1] Compatible with NCT3015Y-R and NCT3018Y-R
@ 2023-11-13 10:38 ` Mia Lin
0 siblings, 0 replies; 6+ messages in thread
From: Mia Lin @ 2023-11-13 10:38 UTC (permalink / raw)
To: avifishman70, tmaimon77, tali.perry1, venture, yuenn,
benjaminfair, a.zummo, alexandre.belloni, KWLIU, JJLIU0, KFLIN,
mylin1
Cc: openbmc, linux-rtc, linux-kernel, Mia Lin
Changes since version 7:
Fix the part number parameter checking issue.
Changes since version 6:
Move the part number parameter to struct nct3018y.
Changes since version 5:
Add global parameter to store part number.
Remove unnecessary changes for easier reading.
Changes since version 4:
Add an introduction bewteen NCT3015Y-R and NCT3018Y-R.
Restore the initial value of err in nct3018y_rtc_set_time().
Refine error messages to pinpoint the correct location.
Changes since version 3:
Remove the comparison between DT compatible and chip data.
Changes since version 2:
Add DT compatible to check the chip matches or not.
Changes since version 1:
rtc: nuvoton: Compatible with NCT3015Y-R and NCT3018Y-R
Mia Lin (1):
rtc: nuvoton: Compatible with NCT3015Y-R and NCT3018Y-R
drivers/rtc/rtc-nct3018y.c | 52 +++++++++++++++++++++++++++++++++-----
1 file changed, 46 insertions(+), 6 deletions(-)
--
2.25.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v7 0/1] Compatible with NCT3015Y-R and NCT3018Y-R
@ 2023-11-13 10:38 ` Mia Lin
0 siblings, 0 replies; 6+ messages in thread
From: Mia Lin @ 2023-11-13 10:38 UTC (permalink / raw)
To: avifishman70, tmaimon77, tali.perry1, venture, yuenn,
benjaminfair, a.zummo, alexandre.belloni, KWLIU, JJLIU0, KFLIN,
mylin1
Cc: linux-rtc, openbmc, Mia Lin, linux-kernel
Changes since version 7:
Fix the part number parameter checking issue.
Changes since version 6:
Move the part number parameter to struct nct3018y.
Changes since version 5:
Add global parameter to store part number.
Remove unnecessary changes for easier reading.
Changes since version 4:
Add an introduction bewteen NCT3015Y-R and NCT3018Y-R.
Restore the initial value of err in nct3018y_rtc_set_time().
Refine error messages to pinpoint the correct location.
Changes since version 3:
Remove the comparison between DT compatible and chip data.
Changes since version 2:
Add DT compatible to check the chip matches or not.
Changes since version 1:
rtc: nuvoton: Compatible with NCT3015Y-R and NCT3018Y-R
Mia Lin (1):
rtc: nuvoton: Compatible with NCT3015Y-R and NCT3018Y-R
drivers/rtc/rtc-nct3018y.c | 52 +++++++++++++++++++++++++++++++++-----
1 file changed, 46 insertions(+), 6 deletions(-)
--
2.25.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v7 1/1] rtc: nuvoton: Compatible with NCT3015Y-R and NCT3018Y-R
2023-11-13 10:38 ` Mia Lin
@ 2023-11-13 10:38 ` Mia Lin
-1 siblings, 0 replies; 6+ messages in thread
From: Mia Lin @ 2023-11-13 10:38 UTC (permalink / raw)
To: avifishman70, tmaimon77, tali.perry1, venture, yuenn,
benjaminfair, a.zummo, alexandre.belloni, KWLIU, JJLIU0, KFLIN,
mylin1
Cc: openbmc, linux-rtc, linux-kernel, Mia Lin
The NCT3015Y-R and NCT3018Y-R use the same datasheet
but have different topologies as follows.
- Topology (Only 1st i2c can set TWO bit and HF bit)
In NCT3015Y-R,
rtc 1st i2c is connected to a host CPU
rtc 2nd i2c is connected to a BMC
In NCT3018Y-R,
rtc 1st i2c is connected to a BMC
rtc 2nd i2c is connected to a host CPU
In order to be compatible with NCT3015Y-R and NCT3018Y-R,
- In probe,
If part number is NCT3018Y-R, only set HF bit to 24-Hour format.
Else, do nothing
- In set_time,
If part number is NCT3018Y-R && TWO bit is 0,
change TWO bit to 1, and restore TWO bit after updating time.
Signed-off-by: Mia Lin <mimi05633@gmail.com>
---
Changes since version 7:
Fix the part number parameter checking issue.
drivers/rtc/rtc-nct3018y.c | 52 +++++++++++++++++++++++++++++++++-----
1 file changed, 46 insertions(+), 6 deletions(-)
diff --git a/drivers/rtc/rtc-nct3018y.c b/drivers/rtc/rtc-nct3018y.c
index ed4e606be8e5..f488a189a465 100644
--- a/drivers/rtc/rtc-nct3018y.c
+++ b/drivers/rtc/rtc-nct3018y.c
@@ -23,6 +23,7 @@
#define NCT3018Y_REG_CTRL 0x0A /* timer control */
#define NCT3018Y_REG_ST 0x0B /* status */
#define NCT3018Y_REG_CLKO 0x0C /* clock out */
+#define NCT3018Y_REG_PART 0x21 /* part info */
#define NCT3018Y_BIT_AF BIT(7)
#define NCT3018Y_BIT_ST BIT(7)
@@ -37,10 +38,12 @@
#define NCT3018Y_REG_BAT_MASK 0x07
#define NCT3018Y_REG_CLKO_F_MASK 0x03 /* frequenc mask */
#define NCT3018Y_REG_CLKO_CKE 0x80 /* clock out enabled */
+#define NCT3018Y_REG_PART_NCT3018Y 0x02
struct nct3018y {
struct rtc_device *rtc;
struct i2c_client *client;
+ int part_num;
#ifdef CONFIG_COMMON_CLK
struct clk_hw clkout_hw;
#endif
@@ -177,8 +180,27 @@ static int nct3018y_rtc_read_time(struct device *dev, struct rtc_time *tm)
static int nct3018y_rtc_set_time(struct device *dev, struct rtc_time *tm)
{
struct i2c_client *client = to_i2c_client(dev);
+ struct nct3018y *nct3018y = dev_get_drvdata(dev);
unsigned char buf[4] = {0};
- int err;
+ int err, flags;
+ int restore_flags = 0;
+
+ flags = i2c_smbus_read_byte_data(client, NCT3018Y_REG_CTRL);
+ if (flags < 0) {
+ dev_dbg(&client->dev, "Failed to read NCT3018Y_REG_CTRL.\n");
+ return flags;
+ }
+
+ /* Check and set TWO bit */
+ if (nct3018y->part_num == NCT3018Y_REG_PART_NCT3018Y && !(flags & NCT3018Y_BIT_TWO)) {
+ restore_flags = 1;
+ flags |= NCT3018Y_BIT_TWO;
+ err = i2c_smbus_write_byte_data(client, NCT3018Y_REG_CTRL, flags);
+ if (err < 0) {
+ dev_dbg(&client->dev, "Unable to write NCT3018Y_REG_CTRL.\n");
+ return err;
+ }
+ }
buf[0] = bin2bcd(tm->tm_sec);
err = i2c_smbus_write_byte_data(client, NCT3018Y_REG_SC, buf[0]);
@@ -212,6 +234,18 @@ static int nct3018y_rtc_set_time(struct device *dev, struct rtc_time *tm)
return -EIO;
}
+ /* Restore TWO bit */
+ if (restore_flags) {
+ if (nct3018y->part_num == NCT3018Y_REG_PART_NCT3018Y)
+ flags &= ~NCT3018Y_BIT_TWO;
+
+ err = i2c_smbus_write_byte_data(client, NCT3018Y_REG_CTRL, flags);
+ if (err < 0) {
+ dev_dbg(&client->dev, "Unable to write NCT3018Y_REG_CTRL.\n");
+ return err;
+ }
+ }
+
return err;
}
@@ -479,11 +513,17 @@ static int nct3018y_probe(struct i2c_client *client)
dev_dbg(&client->dev, "%s: NCT3018Y_BIT_TWO is set\n", __func__);
}
- flags = NCT3018Y_BIT_TWO;
- err = i2c_smbus_write_byte_data(client, NCT3018Y_REG_CTRL, flags);
- if (err < 0) {
- dev_dbg(&client->dev, "Unable to write NCT3018Y_REG_CTRL\n");
- return err;
+ nct3018y->part_num = i2c_smbus_read_byte_data(client, NCT3018Y_REG_PART);
+ if (nct3018y->part_num < 0) {
+ dev_dbg(&client->dev, "Failed to read NCT3018Y_REG_PART.\n");
+ return nct3018y->part_num;
+ } else if (nct3018y->part_num == NCT3018Y_REG_PART_NCT3018Y) {
+ flags = NCT3018Y_BIT_HF;
+ err = i2c_smbus_write_byte_data(client, NCT3018Y_REG_CTRL, flags);
+ if (err < 0) {
+ dev_dbg(&client->dev, "Unable to write NCT3018Y_REG_CTRL.\n");
+ return err;
+ }
}
flags = 0;
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v7 1/1] rtc: nuvoton: Compatible with NCT3015Y-R and NCT3018Y-R
@ 2023-11-13 10:38 ` Mia Lin
0 siblings, 0 replies; 6+ messages in thread
From: Mia Lin @ 2023-11-13 10:38 UTC (permalink / raw)
To: avifishman70, tmaimon77, tali.perry1, venture, yuenn,
benjaminfair, a.zummo, alexandre.belloni, KWLIU, JJLIU0, KFLIN,
mylin1
Cc: linux-rtc, openbmc, Mia Lin, linux-kernel
The NCT3015Y-R and NCT3018Y-R use the same datasheet
but have different topologies as follows.
- Topology (Only 1st i2c can set TWO bit and HF bit)
In NCT3015Y-R,
rtc 1st i2c is connected to a host CPU
rtc 2nd i2c is connected to a BMC
In NCT3018Y-R,
rtc 1st i2c is connected to a BMC
rtc 2nd i2c is connected to a host CPU
In order to be compatible with NCT3015Y-R and NCT3018Y-R,
- In probe,
If part number is NCT3018Y-R, only set HF bit to 24-Hour format.
Else, do nothing
- In set_time,
If part number is NCT3018Y-R && TWO bit is 0,
change TWO bit to 1, and restore TWO bit after updating time.
Signed-off-by: Mia Lin <mimi05633@gmail.com>
---
Changes since version 7:
Fix the part number parameter checking issue.
drivers/rtc/rtc-nct3018y.c | 52 +++++++++++++++++++++++++++++++++-----
1 file changed, 46 insertions(+), 6 deletions(-)
diff --git a/drivers/rtc/rtc-nct3018y.c b/drivers/rtc/rtc-nct3018y.c
index ed4e606be8e5..f488a189a465 100644
--- a/drivers/rtc/rtc-nct3018y.c
+++ b/drivers/rtc/rtc-nct3018y.c
@@ -23,6 +23,7 @@
#define NCT3018Y_REG_CTRL 0x0A /* timer control */
#define NCT3018Y_REG_ST 0x0B /* status */
#define NCT3018Y_REG_CLKO 0x0C /* clock out */
+#define NCT3018Y_REG_PART 0x21 /* part info */
#define NCT3018Y_BIT_AF BIT(7)
#define NCT3018Y_BIT_ST BIT(7)
@@ -37,10 +38,12 @@
#define NCT3018Y_REG_BAT_MASK 0x07
#define NCT3018Y_REG_CLKO_F_MASK 0x03 /* frequenc mask */
#define NCT3018Y_REG_CLKO_CKE 0x80 /* clock out enabled */
+#define NCT3018Y_REG_PART_NCT3018Y 0x02
struct nct3018y {
struct rtc_device *rtc;
struct i2c_client *client;
+ int part_num;
#ifdef CONFIG_COMMON_CLK
struct clk_hw clkout_hw;
#endif
@@ -177,8 +180,27 @@ static int nct3018y_rtc_read_time(struct device *dev, struct rtc_time *tm)
static int nct3018y_rtc_set_time(struct device *dev, struct rtc_time *tm)
{
struct i2c_client *client = to_i2c_client(dev);
+ struct nct3018y *nct3018y = dev_get_drvdata(dev);
unsigned char buf[4] = {0};
- int err;
+ int err, flags;
+ int restore_flags = 0;
+
+ flags = i2c_smbus_read_byte_data(client, NCT3018Y_REG_CTRL);
+ if (flags < 0) {
+ dev_dbg(&client->dev, "Failed to read NCT3018Y_REG_CTRL.\n");
+ return flags;
+ }
+
+ /* Check and set TWO bit */
+ if (nct3018y->part_num == NCT3018Y_REG_PART_NCT3018Y && !(flags & NCT3018Y_BIT_TWO)) {
+ restore_flags = 1;
+ flags |= NCT3018Y_BIT_TWO;
+ err = i2c_smbus_write_byte_data(client, NCT3018Y_REG_CTRL, flags);
+ if (err < 0) {
+ dev_dbg(&client->dev, "Unable to write NCT3018Y_REG_CTRL.\n");
+ return err;
+ }
+ }
buf[0] = bin2bcd(tm->tm_sec);
err = i2c_smbus_write_byte_data(client, NCT3018Y_REG_SC, buf[0]);
@@ -212,6 +234,18 @@ static int nct3018y_rtc_set_time(struct device *dev, struct rtc_time *tm)
return -EIO;
}
+ /* Restore TWO bit */
+ if (restore_flags) {
+ if (nct3018y->part_num == NCT3018Y_REG_PART_NCT3018Y)
+ flags &= ~NCT3018Y_BIT_TWO;
+
+ err = i2c_smbus_write_byte_data(client, NCT3018Y_REG_CTRL, flags);
+ if (err < 0) {
+ dev_dbg(&client->dev, "Unable to write NCT3018Y_REG_CTRL.\n");
+ return err;
+ }
+ }
+
return err;
}
@@ -479,11 +513,17 @@ static int nct3018y_probe(struct i2c_client *client)
dev_dbg(&client->dev, "%s: NCT3018Y_BIT_TWO is set\n", __func__);
}
- flags = NCT3018Y_BIT_TWO;
- err = i2c_smbus_write_byte_data(client, NCT3018Y_REG_CTRL, flags);
- if (err < 0) {
- dev_dbg(&client->dev, "Unable to write NCT3018Y_REG_CTRL\n");
- return err;
+ nct3018y->part_num = i2c_smbus_read_byte_data(client, NCT3018Y_REG_PART);
+ if (nct3018y->part_num < 0) {
+ dev_dbg(&client->dev, "Failed to read NCT3018Y_REG_PART.\n");
+ return nct3018y->part_num;
+ } else if (nct3018y->part_num == NCT3018Y_REG_PART_NCT3018Y) {
+ flags = NCT3018Y_BIT_HF;
+ err = i2c_smbus_write_byte_data(client, NCT3018Y_REG_CTRL, flags);
+ if (err < 0) {
+ dev_dbg(&client->dev, "Unable to write NCT3018Y_REG_CTRL.\n");
+ return err;
+ }
}
flags = 0;
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v7 0/1] Compatible with NCT3015Y-R and NCT3018Y-R
2023-11-13 10:38 ` Mia Lin
@ 2024-01-18 0:26 ` Alexandre Belloni
-1 siblings, 0 replies; 6+ messages in thread
From: Alexandre Belloni @ 2024-01-18 0:26 UTC (permalink / raw)
To: avifishman70, tmaimon77, tali.perry1, venture, yuenn,
benjaminfair, a.zummo, KWLIU, JJLIU0, KFLIN, mylin1, Mia Lin
Cc: openbmc, linux-rtc, linux-kernel
On Mon, 13 Nov 2023 18:38:06 +0800, Mia Lin wrote:
> Changes since version 7:
> Fix the part number parameter checking issue.
>
> Changes since version 6:
> Move the part number parameter to struct nct3018y.
>
> Changes since version 5:
> Add global parameter to store part number.
> Remove unnecessary changes for easier reading.
>
> [...]
Applied, thanks!
[1/1] rtc: nuvoton: Compatible with NCT3015Y-R and NCT3018Y-R
https://git.kernel.org/abelloni/c/14688f1a91e1
Best regards,
--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v7 0/1] Compatible with NCT3015Y-R and NCT3018Y-R
@ 2024-01-18 0:26 ` Alexandre Belloni
0 siblings, 0 replies; 6+ messages in thread
From: Alexandre Belloni @ 2024-01-18 0:26 UTC (permalink / raw)
To: avifishman70, tmaimon77, tali.perry1, venture, yuenn,
benjaminfair, a.zummo, KWLIU, JJLIU0, KFLIN, mylin1, Mia Lin
Cc: linux-rtc, openbmc, linux-kernel
On Mon, 13 Nov 2023 18:38:06 +0800, Mia Lin wrote:
> Changes since version 7:
> Fix the part number parameter checking issue.
>
> Changes since version 6:
> Move the part number parameter to struct nct3018y.
>
> Changes since version 5:
> Add global parameter to store part number.
> Remove unnecessary changes for easier reading.
>
> [...]
Applied, thanks!
[1/1] rtc: nuvoton: Compatible with NCT3015Y-R and NCT3018Y-R
https://git.kernel.org/abelloni/c/14688f1a91e1
Best regards,
--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-01-18 0:28 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-11-13 10:38 [PATCH v7 0/1] Compatible with NCT3015Y-R and NCT3018Y-R Mia Lin
2023-11-13 10:38 ` Mia Lin
2023-11-13 10:38 ` [PATCH v7 1/1] rtc: nuvoton: " Mia Lin
2023-11-13 10:38 ` Mia Lin
2024-01-18 0:26 ` [PATCH v7 0/1] " Alexandre Belloni
2024-01-18 0:26 ` Alexandre Belloni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.