From nobody Mon Feb 9 18:43:41 2026 Received: from raptorengineering.com (mail.raptorengineering.com [23.155.224.40]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 34E60199931; Wed, 7 Jan 2026 00:29:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=23.155.224.40 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767745791; cv=none; b=i0Z/A1A5AXzWH2HR13pQCMZfo/KagtQf3muizwHlHG08Q7SZEkMe/xXj2honemamBM+wCXiKd+RituP8ALl6IoupSDygzebOcLncMwK6+2LT4OTu49TO/sS1nbRnz7zm93Wf6+bdUUCVXr6hKnS+77XdTVIJU4FrX/ZpPWnKn1g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767745791; c=relaxed/simple; bh=0Rw+pnDOTx6IXx2Wj1uiIWU+rkffVu6bgJaT2d6yuDg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=bVUgaTg1KrkCLSIop7PASM5Jew5EdhjgR4z2F7ChJw/xCIfngLpBDDDZU2ZGVeUuKfhh16ebn9B+YWBe8U2OsNOkalHSlVc1+rKhyRRsQotKbPxFxtf6UeZ5PnpuHtYFgPj7QHdFENSBDIe08tvgV7JzVe3skYI6VQt0fd0QkKM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=raptorengineering.com; spf=pass smtp.mailfrom=raptorengineering.com; dkim=pass (1024-bit key) header.d=raptorengineering.com header.i=@raptorengineering.com header.b=Ds98jNGR; arc=none smtp.client-ip=23.155.224.40 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=raptorengineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=raptorengineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=raptorengineering.com header.i=@raptorengineering.com header.b="Ds98jNGR" Received: from localhost (localhost [127.0.0.1]) by mail.rptsys.com (Postfix) with ESMTP id 3A1327790ECC; Tue, 6 Jan 2026 18:21:49 -0600 (CST) Received: from mail.rptsys.com ([127.0.0.1]) by localhost (vali.starlink.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id EYjX8IAdMBva; Tue, 6 Jan 2026 18:21:48 -0600 (CST) Received: from localhost (localhost [127.0.0.1]) by mail.rptsys.com (Postfix) with ESMTP id EBDF87791BDA; Tue, 6 Jan 2026 18:21:47 -0600 (CST) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.rptsys.com EBDF87791BDA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raptorengineering.com; s=B8E824E6-0BE2-11E6-931D-288C65937AAD; t=1767745308; bh=x7Jl269MPnTGVh+oawTEvlijbkfUsn1ILrEkuSLx78M=; h=From:To:Date:Message-Id:MIME-Version; b=Ds98jNGRHWDFl05PClkGzDL7+3LMqcnYwY6M08rL5RpqDXbppffJwwSW2+7paUpaH 6MkwrV5jD06eFT1CelJ5u6di2UfvRb+gfX2eUiJ8SdoqtTLauzbTvKdYVmN28rqkL8 6FDK7pCJHCRQOc09KadT55VkYc7A49KfLqewlAJs= X-Virus-Scanned: amavisd-new at rptsys.com Received: from mail.rptsys.com ([127.0.0.1]) by localhost (vali.starlink.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id qMTKWv_u0aRs; Tue, 6 Jan 2026 18:21:47 -0600 (CST) Received: from rcs-ewks-005.starlink.edu (unknown [192.168.20.42]) by mail.rptsys.com (Postfix) with ESMTPSA id BF6477790ECB; Tue, 6 Jan 2026 18:21:47 -0600 (CST) From: Timothy Pearson To: devicetree@vger.kernel.org Cc: linux-kernel@vger.kernel.org, robh+dt@kernel.org, conor+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, lee@kernel.org, Georgy.Yakovlev@sony.com, sanastasio@raptorengineering.com, Timothy Pearson Subject: [PATCH v6 4/4] watchdog: sony-cronos-smc: Add watchdog driver for Sony Cronos SMC Date: Tue, 6 Jan 2026 18:21:36 -0600 Message-Id: <20260107002136.3121607-5-tpearson@raptorengineering.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20260107002136.3121607-1-tpearson@raptorengineering.com> References: <20260107002136.3121607-1-tpearson@raptorengineering.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The Sony Cronos Platform Controller is a multi-purpose platform controller = with an integrated watchdog. Add the watchdog driver for the Cronos SMC. Signed-off-by: Timothy Pearson --- drivers/watchdog/Kconfig | 17 ++ drivers/watchdog/Makefile | 1 + drivers/watchdog/sony-cronos-wdt.c | 283 +++++++++++++++++++++++++++++ 3 files changed, 301 insertions(+) create mode 100644 drivers/watchdog/sony-cronos-wdt.c diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index d3b9df7d466b..9001e4184e9d 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -416,6 +416,23 @@ config SL28CPLD_WATCHDOG To compile this driver as a module, choose M here: the module will be called sl28cpld_wdt. =20 +config SONY_CRONOS_WATCHDOG + tristate "Sony Cronos CPLD Watchdog" + depends on ARCH_ASPEED || COMPILE_TEST + depends on I2C + select WATCHDOG_CORE + help + Say Y here to include support for the watchdog timer + for the Sony Cronos control CPLD. + + All known Cronos systems use the ASpeed AST2600 SoC, + therefore the configuration option is gated on + ARCH_ASPEED selection. If this changes, add the new + SoCs to the selection list. + + To compile this driver as a module, choose M here: the + module will be called sony-cronos-wdt. + # ALPHA Architecture =20 # ARM Architecture diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile index ba52099b1253..aa4d7aa15613 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile @@ -244,3 +244,4 @@ obj-$(CONFIG_MENZ069_WATCHDOG) +=3D menz69_wdt.o obj-$(CONFIG_RAVE_SP_WATCHDOG) +=3D rave-sp-wdt.o obj-$(CONFIG_STPMIC1_WATCHDOG) +=3D stpmic1_wdt.o obj-$(CONFIG_SL28CPLD_WATCHDOG) +=3D sl28cpld_wdt.o +obj-$(CONFIG_SONY_CRONOS_WATCHDOG) +=3D sony-cronos-wdt.o diff --git a/drivers/watchdog/sony-cronos-wdt.c b/drivers/watchdog/sony-cro= nos-wdt.c new file mode 100644 index 000000000000..650fcee28885 --- /dev/null +++ b/drivers/watchdog/sony-cronos-wdt.c @@ -0,0 +1,283 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Watchdog device driver for Sony Cronos SMCs + * Copyright (C) 2015 Dialog Semiconductor Ltd. + * Copyright (C) 2022-2025 Raptor Engineering, LLC + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static const unsigned int wdt_timeout[] =3D { 10, 80 }; +static const unsigned int wdt_timeout_ctl_bits[] =3D { 0x1, 0x0 }; +#define CRONOS_TWDSCALE_DISABLE 0 +#define CRONOS_TWDSCALE_MIN 1 +#define CRONOS_TWDSCALE_MAX (ARRAY_SIZE(wdt_timeout) - 1) +#define CRONOS_WDT_MIN_TIMEOUT wdt_timeout[CRONOS_TWDSCALE_MIN] +#define CRONOS_WDT_MAX_TIMEOUT wdt_timeout[CRONOS_TWDSCALE_MAX] +#define CRONOS_WDG_DEFAULT_TIMEOUT wdt_timeout[CRONOS_TWDSCALE_MAX] + +struct sony_cronos_watchdog { + struct sony_cronos_smc *hw; + struct watchdog_device wdtdev; +}; + +static unsigned int sony_cronos_wdt_read_timeout(struct sony_cronos_watchd= og *wdt) +{ + unsigned int i; + unsigned int val; + + regmap_read(wdt->hw->regmap, CRONOS_WDT_CTL_REG, &val); + + for (i =3D CRONOS_TWDSCALE_MIN; i <=3D CRONOS_TWDSCALE_MAX; i++) { + if (wdt_timeout_ctl_bits[i] =3D=3D (val & CRONOS_WDT_TIMEOUT_MASK)) + return wdt_timeout[i]; + } + + dev_err(wdt->hw->dev, "Invalid configuration data present in watchdog con= trol register!\n"); + return wdt_timeout[CRONOS_WDT_MIN_TIMEOUT]; +} + +static unsigned int sony_cronos_wdt_timeout_to_sel(unsigned int secs) +{ + unsigned int i; + + for (i =3D CRONOS_TWDSCALE_MIN; i <=3D CRONOS_TWDSCALE_MAX; i++) { + if (wdt_timeout[i] >=3D secs) + return wdt_timeout_ctl_bits[i]; + } + + return wdt_timeout_ctl_bits[CRONOS_TWDSCALE_MAX]; +} + +static int sony_cronos_reset_watchdog_timer(struct sony_cronos_watchdog *w= dt) +{ + return regmap_write(wdt->hw->regmap, CRONOS_WDT_CLR_REG, CRONOS_WDT_CLR_V= AL); +} + +static int sony_cronos_wdt_update_timeout_register(struct sony_cronos_watc= hdog *wdt, + unsigned int regval) +{ + int ret; + + struct sony_cronos_smc *chip =3D wdt->hw; + + ret =3D sony_cronos_reset_watchdog_timer(wdt); + if (ret) { + dev_err(wdt->hw->dev, "Watchdog failed to reset (err =3D %d)\n", ret); + goto done; + } + + return regmap_update_bits(chip->regmap, CRONOS_WDT_CTL_REG, CRONOS_WDT_TI= MEOUT_MASK, + regval); + +done: + return ret; +} + +static int sony_cronos_wdt_start(struct watchdog_device *wdd) +{ + struct sony_cronos_watchdog *wdt =3D watchdog_get_drvdata(wdd); + struct sony_cronos_smc *chip =3D wdt->hw; + unsigned int selector; + int ret; + + selector =3D sony_cronos_wdt_timeout_to_sel(wdt->wdtdev.timeout); + ret =3D sony_cronos_wdt_update_timeout_register(wdt, selector); + if (ret) { + dev_err(wdt->hw->dev, "Watchdog prestart configuration failed (err =3D %= d)\n", ret); + goto done; + } + + ret =3D regmap_update_bits(chip->regmap, CRONOS_WDT_CTL_REG, CRONOS_WDT_E= NABLE_MASK, 1); + + if (ret) + dev_err(wdt->hw->dev, "Watchdog failed to start (err =3D %d)\n", ret); + +done: + return ret; +} + +static int sony_cronos_wdt_stop(struct watchdog_device *wdd) +{ + struct sony_cronos_watchdog *wdt =3D watchdog_get_drvdata(wdd); + struct sony_cronos_smc *chip =3D wdt->hw; + int ret; + + ret =3D regmap_update_bits(chip->regmap, CRONOS_WDT_CTL_REG, CRONOS_WDT_E= NABLE_MASK, 1); + if (ret) + dev_err(wdt->hw->dev, "Watchdog failed to stop (err =3D %d)\n", ret); + + return ret; +} + +static int sony_cronos_wdt_ping(struct watchdog_device *wdd) +{ + struct sony_cronos_watchdog *wdt =3D watchdog_get_drvdata(wdd); + int ret; + + /* + * Prevent pings from occurring late in system poweroff/reboot sequence + * and possibly locking out restart handler from accessing i2c bus. + */ + if (system_state > SYSTEM_RUNNING) + return 0; + + ret =3D sony_cronos_reset_watchdog_timer(wdt); + if (ret) + dev_err(wdt->hw->dev, "Failed to ping the watchdog (err =3D %d)\n", ret); + + return ret; +} + +static int sony_cronos_wdt_set_timeout(struct watchdog_device *wdd, unsign= ed int timeout) +{ + struct sony_cronos_watchdog *wdt =3D watchdog_get_drvdata(wdd); + unsigned int selector; + int ret; + + selector =3D sony_cronos_wdt_timeout_to_sel(timeout); + ret =3D sony_cronos_wdt_update_timeout_register(wdt, selector); + if (ret) + dev_err(wdt->hw->dev, "Failed to set watchdog timeout (err =3D %d)\n", r= et); + else + wdd->timeout =3D wdt_timeout[selector]; + + return ret; +} + +static int sony_cronos_wdt_restart(struct watchdog_device *wdd, unsigned l= ong action, void *data) +{ + struct sony_cronos_watchdog *wdt =3D watchdog_get_drvdata(wdd); + struct i2c_client *client =3D to_i2c_client(wdt->hw->dev); + int ret; + + /* Don't use regmap because it is not atomic safe */ + ret =3D i2c_smbus_write_byte_data(client, CRONOS_WDT_CTL_REG, CRONOS_WDT_= CTL_RESET_VAL); + ret =3D i2c_smbus_write_byte_data(client, CRONOS_BMC_RESET_REG, CRONOS_BM= C_RESET_VAL); + if (ret < 0) + dev_alert(wdt->hw->dev, "Failed to shutdown (err =3D %d)\n", ret); + + /* wait for reset to assert... */ + mdelay(500); + + return ret; +} + +static const struct watchdog_info sony_cronos_watchdog_info =3D { + .options =3D WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING, + .identity =3D "Sony Cronos WDT", +}; + +static const struct watchdog_ops sony_cronos_watchdog_ops =3D { + .owner =3D THIS_MODULE, + .start =3D sony_cronos_wdt_start, + .stop =3D sony_cronos_wdt_stop, + .ping =3D sony_cronos_wdt_ping, + .set_timeout =3D sony_cronos_wdt_set_timeout, + .restart =3D sony_cronos_wdt_restart, +}; + +static const struct of_device_id sony_cronos_compatible_id_table[] =3D { + { + .compatible =3D "sony,cronos-watchdog", + }, + {}, +}; + +MODULE_DEVICE_TABLE(of, sony_cronos_compatible_id_table); + +static int sony_cronos_wdt_probe(struct platform_device *pdev) +{ + struct device *dev =3D &pdev->dev; + unsigned int timeout; + struct sony_cronos_smc *chip; + struct sony_cronos_watchdog *wdt; + + chip =3D dev_get_drvdata(dev->parent); + if (!chip) + return -EINVAL; + + wdt =3D devm_kzalloc(dev, sizeof(*wdt), GFP_KERNEL); + if (!wdt) + return -ENOMEM; + + wdt->hw =3D chip; + + wdt->wdtdev.info =3D &sony_cronos_watchdog_info; + wdt->wdtdev.ops =3D &sony_cronos_watchdog_ops; + wdt->wdtdev.min_timeout =3D CRONOS_WDT_MIN_TIMEOUT; + wdt->wdtdev.max_timeout =3D CRONOS_WDT_MAX_TIMEOUT; + wdt->wdtdev.min_hw_heartbeat_ms =3D 0; + wdt->wdtdev.timeout =3D CRONOS_WDG_DEFAULT_TIMEOUT; + wdt->wdtdev.status =3D WATCHDOG_NOWAYOUT_INIT_STATUS; + wdt->wdtdev.parent =3D dev; + + watchdog_set_restart_priority(&wdt->wdtdev, 128); + + watchdog_set_drvdata(&wdt->wdtdev, wdt); + dev_set_drvdata(dev, &wdt->wdtdev); + + timeout =3D sony_cronos_wdt_read_timeout(wdt); + if (timeout) + wdt->wdtdev.timeout =3D timeout; + + /* Set timeout from DT value if available */ + watchdog_init_timeout(&wdt->wdtdev, 0, dev->parent); + + if (timeout) { + sony_cronos_wdt_set_timeout(&wdt->wdtdev, wdt->wdtdev.timeout); + set_bit(WDOG_HW_RUNNING, &wdt->wdtdev.status); + } + + return devm_watchdog_register_device(dev, &wdt->wdtdev); +} + +static int __maybe_unused sony_cronos_wdt_suspend(struct device *dev) +{ + struct watchdog_device *wdd =3D dev_get_drvdata(dev); + + if (watchdog_active(wdd)) + return sony_cronos_wdt_stop(wdd); + + return 0; +} + +static int __maybe_unused sony_cronos_wdt_resume(struct device *dev) +{ + struct watchdog_device *wdd =3D dev_get_drvdata(dev); + + if (watchdog_active(wdd)) + return sony_cronos_wdt_start(wdd); + + return 0; +} + +static SIMPLE_DEV_PM_OPS(sony_cronos_wdt_pm_ops, sony_cronos_wdt_suspend, = sony_cronos_wdt_resume); + +static struct platform_driver sony_cronos_wdt_driver =3D { + .probe =3D sony_cronos_wdt_probe, + .driver =3D { + .name =3D "sony-cronos-watchdog", + .pm =3D &sony_cronos_wdt_pm_ops, + .of_match_table =3D sony_cronos_compatible_id_table, + }, +}; +module_platform_driver(sony_cronos_wdt_driver); + +MODULE_AUTHOR("Raptor Engineering, LLC "); +MODULE_DESCRIPTION("WDT device driver for Sony Cronos SMCs"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:sony-cronos-watchdog"); --=20 2.39.5