| Message ID | 20221109065546.24912-4-mranostay@ti.com |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | mfd: add tps6594x support for Jacinto platforms | expand |
On 09/11/2022 07:55, Matt Ranostay wrote: > From: Keerthy <j-keerthy@ti.com> > > Add support for TPS6594X PMIC RTC. However, currently only get/set of > time + date functionality is supported. > > Signed-off-by: Keerthy <j-keerthy@ti.com> > Signed-off-by: Matt Ranostay <mranostay@ti.com> > --- > drivers/rtc/Kconfig | 10 ++ > drivers/rtc/Makefile | 1 + > drivers/rtc/rtc-tps6594x.c | 181 +++++++++++++++++++++++++++++++++++++ > 3 files changed, 192 insertions(+) > create mode 100644 drivers/rtc/rtc-tps6594x.c > > diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig > index 35298c651730..0adb2c2570b8 100644 > --- a/drivers/rtc/Kconfig > +++ b/drivers/rtc/Kconfig > @@ -588,6 +588,16 @@ config RTC_DRV_TPS65910 > This driver can also be built as a module. If so, the module > will be called rtc-tps65910. > > +config RTC_DRV_TPS6594X > + tristate "TI TPS6594X RTC driver" > + depends on MFD_TPS6594X Perhaps: || COMPILE_TEST (and test it) > + help > + If you say yes here you get support for the RTC of TI TPS6594X series PMIC > + chips. > + > + This driver can also be built as a module. If so, the module > + will be called rtc-tps6594x. > + (...) > + > +static int tps6594x_rtc_probe(struct platform_device *pdev) > +{ > + struct tps6594x *tps6594x = dev_get_drvdata(pdev->dev.parent); > + struct tps6594x_rtc *tps6594x_rtc = NULL; > + int ret; > + > + tps6594x_rtc = devm_kzalloc(&pdev->dev, sizeof(struct tps6594x_rtc), GFP_KERNEL); That's not Linux coding style. Line is too long - wrapping is at 80. sizeof(*), not struct. > + if (!tps6594x_rtc) > + return -ENOMEM; > + > + tps6594x_rtc->dev = &pdev->dev; > + platform_set_drvdata(pdev, tps6594x_rtc); > + > + /* Start RTC */ > + ret = regmap_update_bits(tps6594x->regmap, TPS6594X_RTC_CTRL_1, > + TPS6594X_RTC_CTRL_REG_STOP_RTC, > + TPS6594X_RTC_CTRL_REG_STOP_RTC); > + if (ret < 0) { > + dev_err(&pdev->dev, "RTC_CTRL write failed, err = %d\n", ret); > + return ret; > + } > + > + tps6594x_rtc->rtc = devm_rtc_device_register(&pdev->dev, pdev->name, > + &tps6594x_rtc_ops, THIS_MODULE); > + if (IS_ERR(tps6594x_rtc->rtc)) { > + ret = PTR_ERR(tps6594x_rtc->rtc); > + dev_err(&pdev->dev, "RTC register failed, err = %d\n", ret); > + return ret; return dev_err_probe Best regards, Krzysztof
Hello, On 08/11/2022 22:55:42-0800, Matt Ranostay wrote: > diff --git a/drivers/rtc/rtc-tps6594x.c b/drivers/rtc/rtc-tps6594x.c > new file mode 100644 > index 000000000000..e9f904d0a769 > --- /dev/null > +++ b/drivers/rtc/rtc-tps6594x.c > @@ -0,0 +1,181 @@ > +// SPDX-License-Identifier: GPL-2.0-only > +/* > + * rtc-tps6594x.c -- TPS6594x Real Time Clock driver. > + * > + * Copyright (C) 2022 Texas Instruments Incorporated - https://www.ti.com > + * > + * TODO: alarm support Is this TODO actually useful? :) > +static int tps6594x_rtc_read_time(struct device *dev, struct rtc_time *tm) > +{ > + unsigned char rtc_data[TPS6594X_NUM_TIME_REGS]; > + struct tps6594x *tps6594x = dev_get_drvdata(dev->parent); > + int ret; > + > + /* Reset TPS6594X_RTC_CTRL_REG_GET_TIME bit to zero, required for latch */ > + ret = regmap_update_bits(tps6594x->regmap, TPS6594X_RTC_CTRL_1, > + TPS6594X_RTC_CTRL_REG_GET_TIME, 0); > + if (ret < 0) { > + dev_err(dev, "RTC CTRL reg update failed, err: %d\n", ret); I would avoid these messages that are not actually actionable. > + return ret; > + } > + > + /* Copy RTC counting registers to static registers or latches */ > + ret = regmap_update_bits(tps6594x->regmap, TPS6594X_RTC_CTRL_1, > + TPS6594X_RTC_CTRL_REG_GET_TIME, TPS6594X_RTC_CTRL_REG_GET_TIME); > + if (ret < 0) { > + dev_err(dev, "RTC CTRL reg update failed, err: %d\n", ret); > + return ret; > + } > + > + ret = regmap_bulk_read(tps6594x->regmap, TPS6594X_RTC_SECONDS, > + rtc_data, TPS6594X_NUM_TIME_REGS); > + if (ret < 0) { > + dev_err(dev, "RTC_SECONDS reg read failed, err = %d\n", ret); > + return ret; > + } > + > + tm->tm_sec = bcd2bin(rtc_data[0]); > + tm->tm_min = bcd2bin(rtc_data[1]); > + tm->tm_hour = bcd2bin(rtc_data[2]); > + tm->tm_mday = bcd2bin(rtc_data[3]); > + tm->tm_mon = bcd2bin(rtc_data[4]) - 1; > + tm->tm_year = bcd2bin(rtc_data[5]) + 100; > + > + return ret; > +} > + > +static int tps6594x_rtc_set_time(struct device *dev, struct rtc_time *tm) > +{ > + unsigned char rtc_data[TPS6594X_NUM_TIME_REGS]; > + struct tps6594x *tps6594x = dev_get_drvdata(dev->parent); > + int ret, retries = 5; > + unsigned int val; > + > + rtc_data[0] = bin2bcd(tm->tm_sec); > + rtc_data[1] = bin2bcd(tm->tm_min); > + rtc_data[2] = bin2bcd(tm->tm_hour); > + rtc_data[3] = bin2bcd(tm->tm_mday); > + rtc_data[4] = bin2bcd(tm->tm_mon + 1); > + rtc_data[5] = bin2bcd(tm->tm_year - 100); > + > + /* Stop RTC while updating the RTC time registers */ > + ret = regmap_update_bits(tps6594x->regmap, TPS6594X_RTC_CTRL_1, > + TPS6594X_RTC_CTRL_REG_STOP_RTC, 0); > + if (ret < 0) { > + dev_err(dev, "RTC stop failed, err = %d\n", ret); > + return ret; > + } > + > + /* Waiting till RTC isn't running */ > + do { > + ret = regmap_read(tps6594x->regmap, TPS6594X_RTC_STATUS, &val); > + if (ret < 0) { > + dev_err(dev, "RTC_STATUS reg read failed, err = %d\n", ret); > + return ret; > + } > + msleep(20); > + } while (--retries && (val & TPS6594X_RTC_STATUS_RUN)); Maybe you should go for regmap_read_poll_timeout. > + > + if (!retries) { > + dev_err(dev, "RTC_STATUS is still RUNNING\n"); > + return -ETIMEDOUT; > + } > + > + ret = regmap_bulk_write(tps6594x->regmap, TPS6594X_RTC_SECONDS, > + rtc_data, TPS6594X_NUM_TIME_REGS); > + if (ret < 0) { > + dev_err(dev, "RTC_SECONDS reg write failed, err = %d\n", ret); > + return ret; > + } > + > + /* Start back RTC */ > + ret = regmap_update_bits(tps6594x->regmap, TPS6594X_RTC_CTRL_1, > + TPS6594X_RTC_CTRL_REG_STOP_RTC, > + TPS6594X_RTC_CTRL_REG_STOP_RTC); > + if (ret < 0) > + dev_err(dev, "RTC start failed, err = %d\n", ret); > + > + return ret; > +} > + > +static const struct rtc_class_ops tps6594x_rtc_ops = { > + .read_time = tps6594x_rtc_read_time, > + .set_time = tps6594x_rtc_set_time, > +}; > + > +static int tps6594x_rtc_probe(struct platform_device *pdev) > +{ > + struct tps6594x *tps6594x = dev_get_drvdata(pdev->dev.parent); > + struct tps6594x_rtc *tps6594x_rtc = NULL; > + int ret; > + > + tps6594x_rtc = devm_kzalloc(&pdev->dev, sizeof(struct tps6594x_rtc), GFP_KERNEL); > + if (!tps6594x_rtc) > + return -ENOMEM; > + > + tps6594x_rtc->dev = &pdev->dev; > + platform_set_drvdata(pdev, tps6594x_rtc); > + > + /* Start RTC */ > + ret = regmap_update_bits(tps6594x->regmap, TPS6594X_RTC_CTRL_1, > + TPS6594X_RTC_CTRL_REG_STOP_RTC, > + TPS6594X_RTC_CTRL_REG_STOP_RTC); > + if (ret < 0) { > + dev_err(&pdev->dev, "RTC_CTRL write failed, err = %d\n", ret); > + return ret; > + } It doesn't make sense to start the RTC in probe as it is probably already started and time is kept properly or it is not started and then you can use this information in tps6594x_rtc_read_time as you know the time is not correct. I'd rather ensure it is started in tps6594x_rtc_set_time. > + > + tps6594x_rtc->rtc = devm_rtc_device_register(&pdev->dev, pdev->name, This is deprecated, please use devm_rtc_allocate_device() and devm_rtc_register_device(). You also need to set the range properly. > + &tps6594x_rtc_ops, THIS_MODULE); > + if (IS_ERR(tps6594x_rtc->rtc)) { > + ret = PTR_ERR(tps6594x_rtc->rtc); > + dev_err(&pdev->dev, "RTC register failed, err = %d\n", ret); This message is useless as the core aloready pronts an error on registration failure. > + return ret; > + } > + > + return 0; > +} > + > +#ifdef CONFIG_OF > +static const struct of_device_id of_tps6594x_rtc_match[] = { > + { .compatible = "ti,tps6594x-rtc", }, > + {}, > +}; > +MODULE_DEVICE_TABLE(of, of_tps6594x_rtc_match); > +#endif > + > +static struct platform_driver tps6594x_rtc_driver = { > + .probe = tps6594x_rtc_probe, > + .driver = { > + .name = "tps6594x-rtc", > + .of_match_table = of_match_ptr(of_tps6594x_rtc_match), > + }, > +}; > + > +module_platform_driver(tps6594x_rtc_driver); > + > +MODULE_ALIAS("platform:tps6594x_rtc"); > +MODULE_DESCRIPTION("TI TPS6594x series RTC driver"); > +MODULE_AUTHOR("Keerthy J <j-keerthy@ti.com>"); > +MODULE_LICENSE("GPL"); > -- > 2.38.GIT >
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index 35298c651730..0adb2c2570b8 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig @@ -588,6 +588,16 @@ config RTC_DRV_TPS65910 This driver can also be built as a module. If so, the module will be called rtc-tps65910. +config RTC_DRV_TPS6594X + tristate "TI TPS6594X RTC driver" + depends on MFD_TPS6594X + help + If you say yes here you get support for the RTC of TI TPS6594X series PMIC + chips. + + This driver can also be built as a module. If so, the module + will be called rtc-tps6594x. + config RTC_DRV_RC5T583 tristate "RICOH 5T583 RTC driver" depends on MFD_RC5T583 diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile index c2d474985919..cf46d88bc4b0 100644 --- a/drivers/rtc/Makefile +++ b/drivers/rtc/Makefile @@ -176,6 +176,7 @@ obj-$(CONFIG_RTC_DRV_TEST) += rtc-test.o obj-$(CONFIG_RTC_DRV_TI_K3) += rtc-ti-k3.o obj-$(CONFIG_RTC_DRV_TPS6586X) += rtc-tps6586x.o obj-$(CONFIG_RTC_DRV_TPS65910) += rtc-tps65910.o +obj-$(CONFIG_RTC_DRV_TPS6594X) += rtc-tps6594x.o obj-$(CONFIG_RTC_DRV_TWL4030) += rtc-twl.o obj-$(CONFIG_RTC_DRV_V3020) += rtc-v3020.o obj-$(CONFIG_RTC_DRV_VT8500) += rtc-vt8500.o diff --git a/drivers/rtc/rtc-tps6594x.c b/drivers/rtc/rtc-tps6594x.c new file mode 100644 index 000000000000..e9f904d0a769 --- /dev/null +++ b/drivers/rtc/rtc-tps6594x.c @@ -0,0 +1,181 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * rtc-tps6594x.c -- TPS6594x Real Time Clock driver. + * + * Copyright (C) 2022 Texas Instruments Incorporated - https://www.ti.com + * + * TODO: alarm support + */ + +#include <linux/bcd.h> +#include <linux/errno.h> +#include <linux/init.h> +#include <linux/kernel.h> +#include <linux/mfd/tps6594x.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/rtc.h> +#include <linux/types.h> +#include <linux/platform_device.h> +#include <linux/regmap.h> + +struct tps6594x_rtc { + struct rtc_device *rtc; + struct device *dev; +}; + +#define TPS6594X_NUM_TIME_REGS (TPS6594X_RTC_YEARS - TPS6594X_RTC_SECONDS + 1) + +static int tps6594x_rtc_read_time(struct device *dev, struct rtc_time *tm) +{ + unsigned char rtc_data[TPS6594X_NUM_TIME_REGS]; + struct tps6594x *tps6594x = dev_get_drvdata(dev->parent); + int ret; + + /* Reset TPS6594X_RTC_CTRL_REG_GET_TIME bit to zero, required for latch */ + ret = regmap_update_bits(tps6594x->regmap, TPS6594X_RTC_CTRL_1, + TPS6594X_RTC_CTRL_REG_GET_TIME, 0); + if (ret < 0) { + dev_err(dev, "RTC CTRL reg update failed, err: %d\n", ret); + return ret; + } + + /* Copy RTC counting registers to static registers or latches */ + ret = regmap_update_bits(tps6594x->regmap, TPS6594X_RTC_CTRL_1, + TPS6594X_RTC_CTRL_REG_GET_TIME, TPS6594X_RTC_CTRL_REG_GET_TIME); + if (ret < 0) { + dev_err(dev, "RTC CTRL reg update failed, err: %d\n", ret); + return ret; + } + + ret = regmap_bulk_read(tps6594x->regmap, TPS6594X_RTC_SECONDS, + rtc_data, TPS6594X_NUM_TIME_REGS); + if (ret < 0) { + dev_err(dev, "RTC_SECONDS reg read failed, err = %d\n", ret); + return ret; + } + + tm->tm_sec = bcd2bin(rtc_data[0]); + tm->tm_min = bcd2bin(rtc_data[1]); + tm->tm_hour = bcd2bin(rtc_data[2]); + tm->tm_mday = bcd2bin(rtc_data[3]); + tm->tm_mon = bcd2bin(rtc_data[4]) - 1; + tm->tm_year = bcd2bin(rtc_data[5]) + 100; + + return ret; +} + +static int tps6594x_rtc_set_time(struct device *dev, struct rtc_time *tm) +{ + unsigned char rtc_data[TPS6594X_NUM_TIME_REGS]; + struct tps6594x *tps6594x = dev_get_drvdata(dev->parent); + int ret, retries = 5; + unsigned int val; + + rtc_data[0] = bin2bcd(tm->tm_sec); + rtc_data[1] = bin2bcd(tm->tm_min); + rtc_data[2] = bin2bcd(tm->tm_hour); + rtc_data[3] = bin2bcd(tm->tm_mday); + rtc_data[4] = bin2bcd(tm->tm_mon + 1); + rtc_data[5] = bin2bcd(tm->tm_year - 100); + + /* Stop RTC while updating the RTC time registers */ + ret = regmap_update_bits(tps6594x->regmap, TPS6594X_RTC_CTRL_1, + TPS6594X_RTC_CTRL_REG_STOP_RTC, 0); + if (ret < 0) { + dev_err(dev, "RTC stop failed, err = %d\n", ret); + return ret; + } + + /* Waiting till RTC isn't running */ + do { + ret = regmap_read(tps6594x->regmap, TPS6594X_RTC_STATUS, &val); + if (ret < 0) { + dev_err(dev, "RTC_STATUS reg read failed, err = %d\n", ret); + return ret; + } + msleep(20); + } while (--retries && (val & TPS6594X_RTC_STATUS_RUN)); + + if (!retries) { + dev_err(dev, "RTC_STATUS is still RUNNING\n"); + return -ETIMEDOUT; + } + + ret = regmap_bulk_write(tps6594x->regmap, TPS6594X_RTC_SECONDS, + rtc_data, TPS6594X_NUM_TIME_REGS); + if (ret < 0) { + dev_err(dev, "RTC_SECONDS reg write failed, err = %d\n", ret); + return ret; + } + + /* Start back RTC */ + ret = regmap_update_bits(tps6594x->regmap, TPS6594X_RTC_CTRL_1, + TPS6594X_RTC_CTRL_REG_STOP_RTC, + TPS6594X_RTC_CTRL_REG_STOP_RTC); + if (ret < 0) + dev_err(dev, "RTC start failed, err = %d\n", ret); + + return ret; +} + +static const struct rtc_class_ops tps6594x_rtc_ops = { + .read_time = tps6594x_rtc_read_time, + .set_time = tps6594x_rtc_set_time, +}; + +static int tps6594x_rtc_probe(struct platform_device *pdev) +{ + struct tps6594x *tps6594x = dev_get_drvdata(pdev->dev.parent); + struct tps6594x_rtc *tps6594x_rtc = NULL; + int ret; + + tps6594x_rtc = devm_kzalloc(&pdev->dev, sizeof(struct tps6594x_rtc), GFP_KERNEL); + if (!tps6594x_rtc) + return -ENOMEM; + + tps6594x_rtc->dev = &pdev->dev; + platform_set_drvdata(pdev, tps6594x_rtc); + + /* Start RTC */ + ret = regmap_update_bits(tps6594x->regmap, TPS6594X_RTC_CTRL_1, + TPS6594X_RTC_CTRL_REG_STOP_RTC, + TPS6594X_RTC_CTRL_REG_STOP_RTC); + if (ret < 0) { + dev_err(&pdev->dev, "RTC_CTRL write failed, err = %d\n", ret); + return ret; + } + + tps6594x_rtc->rtc = devm_rtc_device_register(&pdev->dev, pdev->name, + &tps6594x_rtc_ops, THIS_MODULE); + if (IS_ERR(tps6594x_rtc->rtc)) { + ret = PTR_ERR(tps6594x_rtc->rtc); + dev_err(&pdev->dev, "RTC register failed, err = %d\n", ret); + return ret; + } + + return 0; +} + +#ifdef CONFIG_OF +static const struct of_device_id of_tps6594x_rtc_match[] = { + { .compatible = "ti,tps6594x-rtc", }, + {}, +}; +MODULE_DEVICE_TABLE(of, of_tps6594x_rtc_match); +#endif + +static struct platform_driver tps6594x_rtc_driver = { + .probe = tps6594x_rtc_probe, + .driver = { + .name = "tps6594x-rtc", + .of_match_table = of_match_ptr(of_tps6594x_rtc_match), + }, +}; + +module_platform_driver(tps6594x_rtc_driver); + +MODULE_ALIAS("platform:tps6594x_rtc"); +MODULE_DESCRIPTION("TI TPS6594x series RTC driver"); +MODULE_AUTHOR("Keerthy J <j-keerthy@ti.com>"); +MODULE_LICENSE("GPL");