* Add core driver for PMIC rn5t568 @ 2022-01-17 8:59 Juergen Borleis 2022-01-17 8:59 ` [PATCH 1/2] Add the base Ricoh RN5T568 PMIC driver Juergen Borleis 2022-01-17 8:59 ` [PATCH 2/2] Add Ricoh RN5T568 PMIC based watchdog Juergen Borleis 0 siblings, 2 replies; 6+ messages in thread From: Juergen Borleis @ 2022-01-17 8:59 UTC (permalink / raw) To: barebox This change adds the core regmap based access driver and its corresponding watchdog for the former Ricoh (now: Nisshinbo Micro Devices Inc) rn5t568 PMIC device. Supported features are: watchdog, PMIC based power cycle and reset source detection. Singed-off-by: Juergen Borleis <jbe@pengutronix.de> _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/2] Add the base Ricoh RN5T568 PMIC driver 2022-01-17 8:59 Add core driver for PMIC rn5t568 Juergen Borleis @ 2022-01-17 8:59 ` Juergen Borleis 2022-01-17 10:23 ` Sascha Hauer 2022-01-17 8:59 ` [PATCH 2/2] Add Ricoh RN5T568 PMIC based watchdog Juergen Borleis 1 sibling, 1 reply; 6+ messages in thread From: Juergen Borleis @ 2022-01-17 8:59 UTC (permalink / raw) To: barebox --- drivers/mfd/Kconfig | 6 ++ drivers/mfd/Makefile | 1 + drivers/mfd/rn5t568.c | 165 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 172 insertions(+) create mode 100644 drivers/mfd/rn5t568.c diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index 8468a2d..1602480 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -68,6 +68,12 @@ config MFD_STPMIC1 help Select this to support communication with the STPMIC1. +config MFD_RN568PMIC + depends on I2C + bool "Ricoh RN5T568 MFD driver" + help + Select this to support communication with the Ricoh RN5T568 PMIC. + config MFD_SUPERIO bool diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile index 2bcf900..50f54cf 100644 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile @@ -13,6 +13,7 @@ obj-$(CONFIG_MFD_TWL4030) += twl4030.o obj-$(CONFIG_MFD_TWL6030) += twl6030.o obj-$(CONFIG_RAVE_SP_CORE) += rave-sp.o obj-$(CONFIG_MFD_STPMIC1) += stpmic1.o +obj-$(CONFIG_MFD_RN568PMIC) += rn5t568.o obj-$(CONFIG_MFD_SUPERIO) += superio.o obj-$(CONFIG_FINTEK_SUPERIO) += fintek-superio.o obj-$(CONFIG_SMSC_SUPERIO) += smsc-superio.o diff --git a/drivers/mfd/rn5t568.c b/drivers/mfd/rn5t568.c new file mode 100644 index 0000000..ad53d7b --- /dev/null +++ b/drivers/mfd/rn5t568.c @@ -0,0 +1,165 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * MFD core driver for Ricoh RN5T618 PMIC + * Note: Manufacturer is now Nisshinbo Micro Devices Inc. + * + * Copyright (C) 2014 Beniamino Galvani <b.galvani@gmail.com> + * Copyright (C) 2016 Toradex AG + */ + +#include <common.h> +#include <driver.h> +#include <errno.h> +#include <i2c/i2c.h> +#include <init.h> +#include <of.h> +#include <regmap.h> +#include <reset_source.h> +#include <restart.h> + +#define RN5T568_LSIVER 0x00 +#define RN5T568_OTPVER 0x01 +#define RN5T568_PONHIS 0x09 +# define RN5T568_PONHIS_ON_EXTINPON BIT(3) +# define RN5T568_PONHIS_ON_REPWRPON BIT(1) +# define RN5T568_PONHIS_ON_PWRONPON BIT(0) +#define RN5T568_POFFHIS 0x0a +# define RN5T568_POFFHIS_N_OEPOFF BIT(7) +# define RN5T568_POFFHIS_DCLIMPOFF BIT(6) +# define RN5T568_POFFHIS_WDGPOFF BIT(5) +# define RN5T568_POFFHIS_CPUPOFF BIT(4) +# define RN5T568_POFFHIS_IODETPOFF BIT(3) +# define RN5T568_POFFHIS_VINDETPOFF BIT(2) +# define RN5T568_POFFHIS_TSHUTPOFF BIT(1) +# define RN5T568_POFFHIS_PWRONPOFF BIT(0) +#define RN5T568_SLPCNT 0x0e +# define RN5T568_SLPCNT_SWPPWROFF BIT(0) +#define RN5T568_REPCNT 0x0f +# define RN5T568_REPCNT_OFF_RESETO_16MS 0x30 +# define RN5T568_REPCNT_OFF_REPWRTIM_1000MS 0x06 +# define RN5T568_REPCNT_OFF_REPWRON BIT(0) +#define RN5T568_MAX_REG 0xbc + +struct rn5t568 { + struct restart_handler restart; + struct regmap *regmap; +}; + +static struct rn5t568 single_pmic; + +static void rn5t568_restart(struct restart_handler *rst) +{ + struct rn5t568 *rn5t568 = container_of(rst, struct rn5t568, restart); + + regmap_write(rn5t568->regmap, RN5T568_SLPCNT, RN5T568_SLPCNT_SWPPWROFF); +} + +static int rn5t568_reset_reason_detect(struct device_d *dev, struct regmap *regmap) +{ + unsigned int reg; + int ret; + + ret = regmap_read(regmap, RN5T568_PONHIS, ®); + if (ret) + return ret; + + dev_dbg(dev, "Power-on history: %x\n", reg); + + if (reg == 0) { + dev_info(dev, "No power-on reason available\n"); + return 0; + } + + if (reg & RN5T568_PONHIS_ON_EXTINPON) { + reset_source_set_device(dev, RESET_POR); + return 0; + } else if (reg & RN5T568_PONHIS_ON_PWRONPON) { + reset_source_set_device(dev, RESET_POR); + return 0; + } else if (!(reg & RN5T568_PONHIS_ON_REPWRPON)) + return -EINVAL; + + ret = regmap_read(regmap, RN5T568_POFFHIS, ®); + if (ret) + return ret; + + dev_dbg(dev, "Power-off history: %x\n", reg); + + if (reg & RN5T568_POFFHIS_PWRONPOFF) + reset_source_set_device(dev, RESET_POR); + else if (reg & RN5T568_POFFHIS_TSHUTPOFF) + reset_source_set_device(dev, RESET_THERM); + else if (reg & RN5T568_POFFHIS_VINDETPOFF) + reset_source_set_device(dev, RESET_BROWNOUT); + else if (reg & RN5T568_POFFHIS_IODETPOFF) + reset_source_set_device(dev, RESET_UKWN); + else if (reg & RN5T568_POFFHIS_CPUPOFF) + reset_source_set_device(dev, RESET_RST); + else if (reg & RN5T568_POFFHIS_WDGPOFF) + reset_source_set_device(dev, RESET_WDG); + else if (reg & RN5T568_POFFHIS_DCLIMPOFF) + reset_source_set_device(dev, RESET_BROWNOUT); + else if (reg & RN5T568_POFFHIS_N_OEPOFF) + reset_source_set_device(dev, RESET_EXT); + else + return -EINVAL; + + return 0; +} + +static const struct regmap_config rn5t568_regmap_config = { + .reg_bits = 8, + .val_bits = 8, + .max_register = RN5T568_MAX_REG, +}; + +static int __init rn5t568_i2c_probe(struct device_d *dev) +{ + static const unsigned int val = RN5T568_REPCNT_OFF_RESETO_16MS | RN5T568_REPCNT_OFF_REPWRTIM_1000MS | RN5T568_REPCNT_OFF_REPWRON; + unsigned char reg[4]; + int ret; + + single_pmic.regmap = regmap_init_i2c(to_i2c_client(dev), &rn5t568_regmap_config); + if (IS_ERR(single_pmic.regmap)) + return PTR_ERR(single_pmic.regmap); + + ret = regmap_register_cdev(single_pmic.regmap, NULL); + if (ret) + return ret; + + ret = regmap_bulk_read(single_pmic.regmap, RN5T568_LSIVER, ®, 2); + if (ret) { + dev_err(dev, "Failed to read PMIC version via I2C\n"); + return ret; + } + + dev_info(dev, "Found NMD RN5T568 LSI %x, OTP: %x\n", reg[0], reg[1]); + + /* used to trigger software reset and by a watchdog trigger */ + regmap_write(single_pmic.regmap, RN5T568_REPCNT, val); + + single_pmic.restart.priority = of_get_restart_priority(dev->device_node); + single_pmic.restart.name = "RN5T568"; + single_pmic.restart.restart = &rn5t568_restart; + restart_handler_register(&single_pmic.restart); + dev_dbg(dev, "RN5t: Restart handler with priority %d registered\n", single_pmic.restart.priority); + + ret = rn5t568_reset_reason_detect(dev, single_pmic.regmap); + if (ret) + dev_warn(dev, "Failed to query reset reason\n"); + + return of_platform_populate(dev->device_node, NULL, dev); +} + +static __maybe_unused const struct of_device_id rn5t568_of_match[] = { + { .compatible = "ricoh,rn5t568", .data = NULL, }, + { } +}; + +static struct driver_d rn5t568_i2c_driver = { + .name = "rn5t568-i2c", + .probe = rn5t568_i2c_probe, + .of_compatible = DRV_OF_COMPAT(rn5t568_of_match), +}; + +coredevice_i2c_driver(rn5t568_i2c_driver); -- 2.30.2 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] Add the base Ricoh RN5T568 PMIC driver 2022-01-17 8:59 ` [PATCH 1/2] Add the base Ricoh RN5T568 PMIC driver Juergen Borleis @ 2022-01-17 10:23 ` Sascha Hauer 0 siblings, 0 replies; 6+ messages in thread From: Sascha Hauer @ 2022-01-17 10:23 UTC (permalink / raw) To: Juergen Borleis; +Cc: barebox On Mon, Jan 17, 2022 at 09:59:07AM +0100, Juergen Borleis wrote: > --- > drivers/mfd/Kconfig | 6 ++ > drivers/mfd/Makefile | 1 + > drivers/mfd/rn5t568.c | 165 ++++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 172 insertions(+) > create mode 100644 drivers/mfd/rn5t568.c > > diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig > index 8468a2d..1602480 100644 > --- a/drivers/mfd/Kconfig > +++ b/drivers/mfd/Kconfig > @@ -68,6 +68,12 @@ config MFD_STPMIC1 > help > Select this to support communication with the STPMIC1. > > +config MFD_RN568PMIC > + depends on I2C > + bool "Ricoh RN5T568 MFD driver" > + help > + Select this to support communication with the Ricoh RN5T568 PMIC. > + > config MFD_SUPERIO > bool > > diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile > index 2bcf900..50f54cf 100644 > --- a/drivers/mfd/Makefile > +++ b/drivers/mfd/Makefile > @@ -13,6 +13,7 @@ obj-$(CONFIG_MFD_TWL4030) += twl4030.o > obj-$(CONFIG_MFD_TWL6030) += twl6030.o > obj-$(CONFIG_RAVE_SP_CORE) += rave-sp.o > obj-$(CONFIG_MFD_STPMIC1) += stpmic1.o > +obj-$(CONFIG_MFD_RN568PMIC) += rn5t568.o > obj-$(CONFIG_MFD_SUPERIO) += superio.o > obj-$(CONFIG_FINTEK_SUPERIO) += fintek-superio.o > obj-$(CONFIG_SMSC_SUPERIO) += smsc-superio.o > diff --git a/drivers/mfd/rn5t568.c b/drivers/mfd/rn5t568.c > new file mode 100644 > index 0000000..ad53d7b > --- /dev/null > +++ b/drivers/mfd/rn5t568.c > @@ -0,0 +1,165 @@ > +// SPDX-License-Identifier: GPL-2.0-only > +/* > + * MFD core driver for Ricoh RN5T618 PMIC > + * Note: Manufacturer is now Nisshinbo Micro Devices Inc. > + * > + * Copyright (C) 2014 Beniamino Galvani <b.galvani@gmail.com> > + * Copyright (C) 2016 Toradex AG > + */ > + > +#include <common.h> > +#include <driver.h> > +#include <errno.h> > +#include <i2c/i2c.h> > +#include <init.h> > +#include <of.h> > +#include <regmap.h> > +#include <reset_source.h> > +#include <restart.h> > + > +#define RN5T568_LSIVER 0x00 > +#define RN5T568_OTPVER 0x01 > +#define RN5T568_PONHIS 0x09 > +# define RN5T568_PONHIS_ON_EXTINPON BIT(3) > +# define RN5T568_PONHIS_ON_REPWRPON BIT(1) > +# define RN5T568_PONHIS_ON_PWRONPON BIT(0) > +#define RN5T568_POFFHIS 0x0a > +# define RN5T568_POFFHIS_N_OEPOFF BIT(7) > +# define RN5T568_POFFHIS_DCLIMPOFF BIT(6) > +# define RN5T568_POFFHIS_WDGPOFF BIT(5) > +# define RN5T568_POFFHIS_CPUPOFF BIT(4) > +# define RN5T568_POFFHIS_IODETPOFF BIT(3) > +# define RN5T568_POFFHIS_VINDETPOFF BIT(2) > +# define RN5T568_POFFHIS_TSHUTPOFF BIT(1) > +# define RN5T568_POFFHIS_PWRONPOFF BIT(0) > +#define RN5T568_SLPCNT 0x0e > +# define RN5T568_SLPCNT_SWPPWROFF BIT(0) > +#define RN5T568_REPCNT 0x0f > +# define RN5T568_REPCNT_OFF_RESETO_16MS 0x30 > +# define RN5T568_REPCNT_OFF_REPWRTIM_1000MS 0x06 > +# define RN5T568_REPCNT_OFF_REPWRON BIT(0) > +#define RN5T568_MAX_REG 0xbc > + > +struct rn5t568 { > + struct restart_handler restart; > + struct regmap *regmap; > +}; > + > +static struct rn5t568 single_pmic; Please do not artificially limit the driver to a single instance only. > + > +static void rn5t568_restart(struct restart_handler *rst) > +{ > + struct rn5t568 *rn5t568 = container_of(rst, struct rn5t568, restart); > + > + regmap_write(rn5t568->regmap, RN5T568_SLPCNT, RN5T568_SLPCNT_SWPPWROFF); > +} > + > +static int rn5t568_reset_reason_detect(struct device_d *dev, struct regmap *regmap) > +{ > + unsigned int reg; > + int ret; > + > + ret = regmap_read(regmap, RN5T568_PONHIS, ®); > + if (ret) > + return ret; > + > + dev_dbg(dev, "Power-on history: %x\n", reg); > + > + if (reg == 0) { > + dev_info(dev, "No power-on reason available\n"); > + return 0; > + } > + > + if (reg & RN5T568_PONHIS_ON_EXTINPON) { > + reset_source_set_device(dev, RESET_POR); > + return 0; > + } else if (reg & RN5T568_PONHIS_ON_PWRONPON) { > + reset_source_set_device(dev, RESET_POR); > + return 0; > + } else if (!(reg & RN5T568_PONHIS_ON_REPWRPON)) > + return -EINVAL; > + > + ret = regmap_read(regmap, RN5T568_POFFHIS, ®); > + if (ret) > + return ret; > + > + dev_dbg(dev, "Power-off history: %x\n", reg); > + > + if (reg & RN5T568_POFFHIS_PWRONPOFF) > + reset_source_set_device(dev, RESET_POR); > + else if (reg & RN5T568_POFFHIS_TSHUTPOFF) > + reset_source_set_device(dev, RESET_THERM); > + else if (reg & RN5T568_POFFHIS_VINDETPOFF) > + reset_source_set_device(dev, RESET_BROWNOUT); > + else if (reg & RN5T568_POFFHIS_IODETPOFF) > + reset_source_set_device(dev, RESET_UKWN); > + else if (reg & RN5T568_POFFHIS_CPUPOFF) > + reset_source_set_device(dev, RESET_RST); > + else if (reg & RN5T568_POFFHIS_WDGPOFF) > + reset_source_set_device(dev, RESET_WDG); > + else if (reg & RN5T568_POFFHIS_DCLIMPOFF) > + reset_source_set_device(dev, RESET_BROWNOUT); > + else if (reg & RN5T568_POFFHIS_N_OEPOFF) > + reset_source_set_device(dev, RESET_EXT); > + else > + return -EINVAL; > + > + return 0; > +} > + > +static const struct regmap_config rn5t568_regmap_config = { > + .reg_bits = 8, > + .val_bits = 8, > + .max_register = RN5T568_MAX_REG, > +}; > + > +static int __init rn5t568_i2c_probe(struct device_d *dev) > +{ > + static const unsigned int val = RN5T568_REPCNT_OFF_RESETO_16MS | RN5T568_REPCNT_OFF_REPWRTIM_1000MS | RN5T568_REPCNT_OFF_REPWRON; val is used only once. Maybe drop the variable and use the value directly? > + unsigned char reg[4]; reg[2] should be enough. This doesn't matter much but might be a bit confusing otherwise. Sascha -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/2] Add Ricoh RN5T568 PMIC based watchdog 2022-01-17 8:59 Add core driver for PMIC rn5t568 Juergen Borleis 2022-01-17 8:59 ` [PATCH 1/2] Add the base Ricoh RN5T568 PMIC driver Juergen Borleis @ 2022-01-17 8:59 ` Juergen Borleis 2022-01-17 11:46 ` Sascha Hauer 1 sibling, 1 reply; 6+ messages in thread From: Juergen Borleis @ 2022-01-17 8:59 UTC (permalink / raw) To: barebox --- drivers/watchdog/Kconfig | 6 ++ drivers/watchdog/Makefile | 1 + drivers/watchdog/rn5t568_wdt.c | 140 +++++++++++++++++++++++++++++++++ 3 files changed, 147 insertions(+) create mode 100644 drivers/watchdog/rn5t568_wdt.c diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index d605e62..61a096b 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -109,6 +109,12 @@ config STPMIC1_WATCHDOG help Enable to support configuration of the stpmic1's built-in watchdog. +config RN568_WATCHDOG + bool "Ricoh RN5t568 PMIC based Watchdog" + depends on MFD_RN568PMIC + help + Enable to support system control via the PMIC based watchdog. + config F71808E_WDT bool "Fintek F718xx, F818xx Super I/O Watchdog" depends on X86 diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile index dbb76a5..84fd2bf 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile @@ -16,6 +16,7 @@ obj-$(CONFIG_ARCH_BCM283X) += bcm2835_wdt.o obj-$(CONFIG_RAVE_SP_WATCHDOG) += rave-sp-wdt.o obj-$(CONFIG_STM32_IWDG_WATCHDOG) += stm32_iwdg.o obj-$(CONFIG_STPMIC1_WATCHDOG) += stpmic1_wdt.o +obj-$(CONFIG_RN568_WATCHDOG) += rn5t568_wdt.o obj-$(CONFIG_F71808E_WDT) += f71808e_wdt.o obj-$(CONFIG_GPIO_WATCHDOG) += gpio_wdt.o obj-$(CONFIG_ITCO_WDT) += itco_wdt.o diff --git a/drivers/watchdog/rn5t568_wdt.c b/drivers/watchdog/rn5t568_wdt.c new file mode 100644 index 0000000..f6e7234 --- /dev/null +++ b/drivers/watchdog/rn5t568_wdt.c @@ -0,0 +1,140 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Watchdog driver for Ricoh RN5T618 PMIC + * + * Copyright (C) 2014 Beniamino Galvani <b.galvani@gmail.com> + */ + +#include <common.h> +#include <init.h> +#include <watchdog.h> +#include <regmap.h> +#include <of.h> + +#define RN5T568_WATCHDOG 0x0b +# define RN5T568_WATCHDOG_WDPWROFFEN BIT(2) +# define RN5T568_WATCHDOG_WDOGTIM_M (BIT(0) | BIT(1)) +#define RN5T568_PWRIREN 0x12 +# define RN5T568_PWRIREN_EN_WDOG BIT(6) +#define RN5T568_PWRIRQ 0x13 +# define RN5T568_PWRIRQ_IR_WDOG BIT(6) + +struct rn5t568_wdt { + struct watchdog wdd; + struct regmap *regmap; + unsigned int timeout; +}; + +struct rn5t568_wdt_tim { + u8 reg_val; + u8 time; +}; + +static const struct rn5t568_wdt_tim rn5t568_wdt_timeout[] = { + { .reg_val = 0, .time = 1, }, + { .reg_val = 1, .time = 8, }, + { .reg_val = 2, .time = 32, }, + { .reg_val = 3, .time = 128, }, +}; + +#define PMIC_WDT_MAX_TIMEOUT 128 + +static int rn5t568_wdt_start(struct regmap *regmap, int idx) +{ + int ret; + + ret = regmap_update_bits(regmap, RN5T568_WATCHDOG, RN5T568_WATCHDOG_WDOGTIM_M, + rn5t568_wdt_timeout[idx].reg_val); + if (ret) + return ret; + + regmap_update_bits(regmap, RN5T568_PWRIRQ, RN5T568_PWRIRQ_IR_WDOG, 0x00); + regmap_update_bits(regmap, RN5T568_PWRIREN, RN5T568_PWRIREN_EN_WDOG, RN5T568_PWRIREN_EN_WDOG); + + pr_debug("RN5t: Starting the watchdog with %u seconds\n", rn5t568_wdt_timeout[idx].time); + + return regmap_update_bits(regmap, RN5T568_WATCHDOG, RN5T568_WATCHDOG_WDPWROFFEN, + RN5T568_WATCHDOG_WDPWROFFEN); +} + +static int rn5t568_wdt_stop(struct regmap *regmap) +{ + int ret; + + ret = regmap_update_bits(regmap, RN5T568_PWRIREN, RN5T568_PWRIREN_EN_WDOG, 0); + if (ret) + return ret; + return regmap_update_bits(regmap, RN5T568_WATCHDOG, RN5T568_WATCHDOG_WDPWROFFEN, 0); +} + +static int rn5t568_wdt_ping(struct regmap *regmap) +{ + unsigned int val; + int ret; + + ret = regmap_read(regmap, RN5T568_WATCHDOG, &val); + if (ret) + return ret; + + return regmap_write(regmap, RN5T568_WATCHDOG, val); +} + +static int rn5t568_wdt_set_timeout(struct watchdog *wdd, unsigned int timeout) +{ + struct rn5t568_wdt *wdt = container_of(wdd, struct rn5t568_wdt, wdd); + int ret, i; + + if (!timeout) + return rn5t568_wdt_stop(wdt->regmap); + + for (i = 0; i < ARRAY_SIZE(rn5t568_wdt_timeout); i++) { + if (rn5t568_wdt_timeout[i].time + 1 >= timeout) + break; + } + + if (i == ARRAY_SIZE(rn5t568_wdt_timeout)) + return -EINVAL; + + if (wdt->timeout == timeout) + return rn5t568_wdt_ping(wdt->regmap); + + ret = rn5t568_wdt_start(wdt->regmap, i); + if (ret) + return ret; + + wdt->timeout = rn5t568_wdt_timeout[i].time; + + return ret; +} + +static int rn5t568_wdt_probe(struct device_d *dev) +{ + struct rn5t568_wdt *wdt; + struct watchdog *wdd; + + wdt = xzalloc(sizeof(*wdt)); + + wdt->regmap = dev_get_regmap(dev->parent, NULL); + if (IS_ERR(wdt->regmap)) + return PTR_ERR(wdt->regmap); + + wdd = &wdt->wdd; + wdd->hwdev = dev; + wdd->set_timeout = rn5t568_wdt_set_timeout; + wdd->timeout_max = PMIC_WDT_MAX_TIMEOUT; + + regmap_write(wdt->regmap, RN5T568_WATCHDOG, 0x03); + return watchdog_register(wdd); +} + +static __maybe_unused const struct of_device_id rn5t568_wdt_of_match[] = { + { .compatible = "ricoh,rn5t568-wdt" }, + { /* sentinel */ } +}; + +static struct driver_d rn5t568_wdt_driver = { + .name = "rn5t568-wdt", + .probe = rn5t568_wdt_probe, + .of_compatible = DRV_OF_COMPAT(rn5t568_wdt_of_match), +}; +device_platform_driver(rn5t568_wdt_driver); -- 2.30.2 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] Add Ricoh RN5T568 PMIC based watchdog 2022-01-17 8:59 ` [PATCH 2/2] Add Ricoh RN5T568 PMIC based watchdog Juergen Borleis @ 2022-01-17 11:46 ` Sascha Hauer 2022-01-18 8:17 ` Juergen Borleis 0 siblings, 1 reply; 6+ messages in thread From: Sascha Hauer @ 2022-01-17 11:46 UTC (permalink / raw) To: Juergen Borleis; +Cc: barebox On Mon, Jan 17, 2022 at 09:59:08AM +0100, Juergen Borleis wrote: > --- > drivers/watchdog/Kconfig | 6 ++ > drivers/watchdog/Makefile | 1 + > drivers/watchdog/rn5t568_wdt.c | 140 +++++++++++++++++++++++++++++++++ > 3 files changed, 147 insertions(+) > create mode 100644 drivers/watchdog/rn5t568_wdt.c > > diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig > index d605e62..61a096b 100644 > --- a/drivers/watchdog/Kconfig > +++ b/drivers/watchdog/Kconfig > @@ -109,6 +109,12 @@ config STPMIC1_WATCHDOG > help > Enable to support configuration of the stpmic1's built-in watchdog. > > +config RN568_WATCHDOG > + bool "Ricoh RN5t568 PMIC based Watchdog" > + depends on MFD_RN568PMIC > + help > + Enable to support system control via the PMIC based watchdog. > + > config F71808E_WDT > bool "Fintek F718xx, F818xx Super I/O Watchdog" > depends on X86 > diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile > index dbb76a5..84fd2bf 100644 > --- a/drivers/watchdog/Makefile > +++ b/drivers/watchdog/Makefile > @@ -16,6 +16,7 @@ obj-$(CONFIG_ARCH_BCM283X) += bcm2835_wdt.o > obj-$(CONFIG_RAVE_SP_WATCHDOG) += rave-sp-wdt.o > obj-$(CONFIG_STM32_IWDG_WATCHDOG) += stm32_iwdg.o > obj-$(CONFIG_STPMIC1_WATCHDOG) += stpmic1_wdt.o > +obj-$(CONFIG_RN568_WATCHDOG) += rn5t568_wdt.o > obj-$(CONFIG_F71808E_WDT) += f71808e_wdt.o > obj-$(CONFIG_GPIO_WATCHDOG) += gpio_wdt.o > obj-$(CONFIG_ITCO_WDT) += itco_wdt.o > diff --git a/drivers/watchdog/rn5t568_wdt.c b/drivers/watchdog/rn5t568_wdt.c > new file mode 100644 > index 0000000..f6e7234 > --- /dev/null > +++ b/drivers/watchdog/rn5t568_wdt.c > @@ -0,0 +1,140 @@ > +// SPDX-License-Identifier: GPL-2.0-only > +/* > + * Watchdog driver for Ricoh RN5T618 PMIC > + * > + * Copyright (C) 2014 Beniamino Galvani <b.galvani@gmail.com> > + */ > + > +#include <common.h> > +#include <init.h> > +#include <watchdog.h> > +#include <regmap.h> > +#include <of.h> > + > +#define RN5T568_WATCHDOG 0x0b > +# define RN5T568_WATCHDOG_WDPWROFFEN BIT(2) > +# define RN5T568_WATCHDOG_WDOGTIM_M (BIT(0) | BIT(1)) > +#define RN5T568_PWRIREN 0x12 > +# define RN5T568_PWRIREN_EN_WDOG BIT(6) > +#define RN5T568_PWRIRQ 0x13 > +# define RN5T568_PWRIRQ_IR_WDOG BIT(6) > + > +struct rn5t568_wdt { > + struct watchdog wdd; > + struct regmap *regmap; > + unsigned int timeout; > +}; > + > +struct rn5t568_wdt_tim { > + u8 reg_val; > + u8 time; > +}; > + > +static const struct rn5t568_wdt_tim rn5t568_wdt_timeout[] = { > + { .reg_val = 0, .time = 1, }, > + { .reg_val = 1, .time = 8, }, > + { .reg_val = 2, .time = 32, }, > + { .reg_val = 3, .time = 128, }, > +}; > + > +#define PMIC_WDT_MAX_TIMEOUT 128 > + > +static int rn5t568_wdt_start(struct regmap *regmap, int idx) > +{ > + int ret; > + > + ret = regmap_update_bits(regmap, RN5T568_WATCHDOG, RN5T568_WATCHDOG_WDOGTIM_M, > + rn5t568_wdt_timeout[idx].reg_val); > + if (ret) > + return ret; > + > + regmap_update_bits(regmap, RN5T568_PWRIRQ, RN5T568_PWRIRQ_IR_WDOG, 0x00); > + regmap_update_bits(regmap, RN5T568_PWRIREN, RN5T568_PWRIREN_EN_WDOG, RN5T568_PWRIREN_EN_WDOG); > + > + pr_debug("RN5t: Starting the watchdog with %u seconds\n", rn5t568_wdt_timeout[idx].time); > + > + return regmap_update_bits(regmap, RN5T568_WATCHDOG, RN5T568_WATCHDOG_WDPWROFFEN, > + RN5T568_WATCHDOG_WDPWROFFEN); > +} > + > +static int rn5t568_wdt_stop(struct regmap *regmap) > +{ > + int ret; > + > + ret = regmap_update_bits(regmap, RN5T568_PWRIREN, RN5T568_PWRIREN_EN_WDOG, 0); You could use regmap_[clear|set]_bits() here and elsewhere in the driver. > + if (ret) > + return ret; > + return regmap_update_bits(regmap, RN5T568_WATCHDOG, RN5T568_WATCHDOG_WDPWROFFEN, 0); > +} > + > +static int rn5t568_wdt_ping(struct regmap *regmap) > +{ > + unsigned int val; > + int ret; > + > + ret = regmap_read(regmap, RN5T568_WATCHDOG, &val); > + if (ret) > + return ret; > + > + return regmap_write(regmap, RN5T568_WATCHDOG, val); > +} > + > +static int rn5t568_wdt_set_timeout(struct watchdog *wdd, unsigned int timeout) > +{ > + struct rn5t568_wdt *wdt = container_of(wdd, struct rn5t568_wdt, wdd); > + int ret, i; > + > + if (!timeout) > + return rn5t568_wdt_stop(wdt->regmap); > + > + for (i = 0; i < ARRAY_SIZE(rn5t568_wdt_timeout); i++) { > + if (rn5t568_wdt_timeout[i].time + 1 >= timeout) I don't understand the + 1 here. When I want to have a timeout of 9s the driver uses 8s instead which doesn't seem to be correct. > + break; > + } > + > + if (i == ARRAY_SIZE(rn5t568_wdt_timeout)) > + return -EINVAL; > + > + if (wdt->timeout == timeout) > + return rn5t568_wdt_ping(wdt->regmap); > + > + ret = rn5t568_wdt_start(wdt->regmap, i); > + if (ret) > + return ret; > + > + wdt->timeout = rn5t568_wdt_timeout[i].time; > + > + return ret; > +} > + > +static int rn5t568_wdt_probe(struct device_d *dev) > +{ > + struct rn5t568_wdt *wdt; > + struct watchdog *wdd; > + > + wdt = xzalloc(sizeof(*wdt)); > + > + wdt->regmap = dev_get_regmap(dev->parent, NULL); > + if (IS_ERR(wdt->regmap)) > + return PTR_ERR(wdt->regmap); > + > + wdd = &wdt->wdd; > + wdd->hwdev = dev; > + wdd->set_timeout = rn5t568_wdt_set_timeout; > + wdd->timeout_max = PMIC_WDT_MAX_TIMEOUT; > + > + regmap_write(wdt->regmap, RN5T568_WATCHDOG, 0x03); Why is anything written here to the register? It seems this clears BIT(2) which disables the watchdog, right? If so, that's not a good idea as it might be disabled on purpose by earlier boot stages. You could read the hardware status to provide the WDOG_HW_RUNNING/WDOG_HW_NOT_RUNNING flag. Sascha -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] Add Ricoh RN5T568 PMIC based watchdog 2022-01-17 11:46 ` Sascha Hauer @ 2022-01-18 8:17 ` Juergen Borleis 0 siblings, 0 replies; 6+ messages in thread From: Juergen Borleis @ 2022-01-18 8:17 UTC (permalink / raw) To: Sascha Hauer; +Cc: barebox Hi Sascha, Am Montag, dem 17.01.2022 um 12:46 +0100 schrieb Sascha Hauer: > > --- > > drivers/watchdog/Kconfig | 6 ++ > > drivers/watchdog/Makefile | 1 + > > drivers/watchdog/rn5t568_wdt.c | 140 +++++++++++++++++++++++++++++++++ > > 3 files changed, 147 insertions(+) > > create mode 100644 drivers/watchdog/rn5t568_wdt.c > > > > diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig > > index d605e62..61a096b 100644 > > --- a/drivers/watchdog/Kconfig > > +++ b/drivers/watchdog/Kconfig > > @@ -109,6 +109,12 @@ config STPMIC1_WATCHDOG > > help > > Enable to support configuration of the stpmic1's built-in > > watchdog. > > > > +config RN568_WATCHDOG > > + bool "Ricoh RN5t568 PMIC based Watchdog" > > + depends on MFD_RN568PMIC > > + help > > + Enable to support system control via the PMIC based watchdog. > > + > > config F71808E_WDT > > bool "Fintek F718xx, F818xx Super I/O Watchdog" > > depends on X86 > > diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile > > index dbb76a5..84fd2bf 100644 > > --- a/drivers/watchdog/Makefile > > +++ b/drivers/watchdog/Makefile > > @@ -16,6 +16,7 @@ obj-$(CONFIG_ARCH_BCM283X) += bcm2835_wdt.o > > obj-$(CONFIG_RAVE_SP_WATCHDOG) += rave-sp-wdt.o > > obj-$(CONFIG_STM32_IWDG_WATCHDOG) += stm32_iwdg.o > > obj-$(CONFIG_STPMIC1_WATCHDOG) += stpmic1_wdt.o > > +obj-$(CONFIG_RN568_WATCHDOG) += rn5t568_wdt.o > > obj-$(CONFIG_F71808E_WDT) += f71808e_wdt.o > > obj-$(CONFIG_GPIO_WATCHDOG) += gpio_wdt.o > > obj-$(CONFIG_ITCO_WDT) += itco_wdt.o > > diff --git a/drivers/watchdog/rn5t568_wdt.c b/drivers/watchdog/rn5t568_wdt.c > > new file mode 100644 > > index 0000000..f6e7234 > > --- /dev/null > > +++ b/drivers/watchdog/rn5t568_wdt.c > > @@ -0,0 +1,140 @@ > > +// SPDX-License-Identifier: GPL-2.0-only > > +/* > > + * Watchdog driver for Ricoh RN5T618 PMIC > > + * > > + * Copyright (C) 2014 Beniamino Galvani <b.galvani@gmail.com> > > + */ > > + > > +#include <common.h> > > +#include <init.h> > > +#include <watchdog.h> > > +#include <regmap.h> > > +#include <of.h> > > + > > +#define RN5T568_WATCHDOG 0x0b > > +# define RN5T568_WATCHDOG_WDPWROFFEN BIT(2) > > +# define RN5T568_WATCHDOG_WDOGTIM_M (BIT(0) | BIT(1)) > > +#define RN5T568_PWRIREN 0x12 > > +# define RN5T568_PWRIREN_EN_WDOG BIT(6) > > +#define RN5T568_PWRIRQ 0x13 > > +# define RN5T568_PWRIRQ_IR_WDOG BIT(6) > > + > > +struct rn5t568_wdt { > > + struct watchdog wdd; > > + struct regmap *regmap; > > + unsigned int timeout; > > +}; > > + > > +struct rn5t568_wdt_tim { > > + u8 reg_val; > > + u8 time; > > +}; > > + > > +static const struct rn5t568_wdt_tim rn5t568_wdt_timeout[] = { > > + { .reg_val = 0, .time = 1, }, > > + { .reg_val = 1, .time = 8, }, > > + { .reg_val = 2, .time = 32, }, > > + { .reg_val = 3, .time = 128, }, > > +}; > > + > > +#define PMIC_WDT_MAX_TIMEOUT 128 > > + > > +static int rn5t568_wdt_start(struct regmap *regmap, int idx) > > +{ > > + int ret; > > + > > + ret = regmap_update_bits(regmap, RN5T568_WATCHDOG, > > RN5T568_WATCHDOG_WDOGTIM_M, > > + rn5t568_wdt_timeout[idx].reg_val); > > + if (ret) > > + return ret; > > + > > + regmap_update_bits(regmap, RN5T568_PWRIRQ, RN5T568_PWRIRQ_IR_WDOG, > > 0x00); > > + regmap_update_bits(regmap, RN5T568_PWRIREN, RN5T568_PWRIREN_EN_WDOG, > > RN5T568_PWRIREN_EN_WDOG); > > + > > + pr_debug("RN5t: Starting the watchdog with %u seconds\n", > > rn5t568_wdt_timeout[idx].time); > > + > > + return regmap_update_bits(regmap, RN5T568_WATCHDOG, > > RN5T568_WATCHDOG_WDPWROFFEN, > > + RN5T568_WATCHDOG_WDPWROFFEN); > > +} > > + > > +static int rn5t568_wdt_stop(struct regmap *regmap) > > +{ > > + int ret; > > + > > + ret = regmap_update_bits(regmap, RN5T568_PWRIREN, > > RN5T568_PWRIREN_EN_WDOG, 0); > > You could use regmap_[clear|set]_bits() here and elsewhere in the > driver. Hmmm, seems a Linux kernel feature, I didn't found such functions in barebox. Will send a V2 soon. jb -- Pengutronix e.K. | Juergen Borleis | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-128 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-9 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-01-18 8:19 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2022-01-17 8:59 Add core driver for PMIC rn5t568 Juergen Borleis 2022-01-17 8:59 ` [PATCH 1/2] Add the base Ricoh RN5T568 PMIC driver Juergen Borleis 2022-01-17 10:23 ` Sascha Hauer 2022-01-17 8:59 ` [PATCH 2/2] Add Ricoh RN5T568 PMIC based watchdog Juergen Borleis 2022-01-17 11:46 ` Sascha Hauer 2022-01-18 8:17 ` Juergen Borleis
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox