* [PATCH v2 1/3] rtc: cv1800b: Add seconds counter support
2026-10-06 15:45 [PATCH v2 0/3] rtc: cv1800b: Use the RTC node for time and system reset Zhuxu Ran
@ 2026-10-06 15:45 ` Zhuxu Ran
2026-10-06 15:45 ` [PATCH v2 2/3] riscv: sophgo: Enable RTC-backed system reset Zhuxu Ran
2026-10-06 15:45 ` [PATCH v2 3/3] sysreset: cv1800b: Use the RTC device node for register access Zhuxu Ran
2 siblings, 0 replies; 5+ messages in thread
From: Zhuxu Ran @ 2026-10-06 15:45 UTC (permalink / raw)
To: u-boot
Cc: Yao Zi, Tom Rini, Johan Jonker, Alexander Koch, Kongyang Liu,
Hiago De Franco, Thomas Bonnefille, Quentin Schulz,
Peter Robinson, Leo Yu-Chi Liang, Casey Connolly,
Varadarajan Narayanan, Sumit Garg, Heiko Stuebner, Marek Vasut,
Marek Vasut, Ilias Apalodimas, Zhuxu Ran
Add a driver for the CV1800B RTC seconds counter described by the
upstream devicetree. Map the node's register range, enable the RTC
clock, and implement reading and setting the 32-bit counter. Bind
the existing sysreset driver as a child when enabled.
Adapt the register definitions and seconds-counter sequence from
Linux drivers/rtc/rtc-cv1800.c by Jingbao Qiu.
Link: https://git.kernel.org/linus/d9f82683b123ce315cc36c4b20a5bc3d8644f947
Signed-off-by: Zhuxu Ran <zhuxu_ran@zohomail.com>
---
drivers/rtc/Kconfig | 9 ++++
drivers/rtc/Makefile | 1 +
drivers/rtc/rtc-cv1800b.c | 123 ++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 133 insertions(+)
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 5b44cc99c97..52d0e51acc3 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -54,6 +54,15 @@ config RTC_ARMADA38X
This adds support for the in-chip RTC that can be found in the
Armada 38x Marvell's SoC devices.
+config RTC_CV1800B
+ bool "Enable Sophgo CV1800B RTC driver"
+ depends on DM_RTC
+ select REGMAP
+ help
+ Enable access to the RTC seconds counter found on Sophgo CV1800B
+ SoCs. When system reset support is enabled, the driver also
+ binds the reset function provided by the RTC subsystem.
+
config RTC_PCF2127
bool "Enable PCF2127 driver"
depends on DM_RTC
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index 742481ce185..53f704fe511 100644
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -7,6 +7,7 @@
obj-$(CONFIG_$(PHASE_)DM_RTC) += rtc-uclass.o
obj-$(CONFIG_RTC_ARMADA38X) += armada38x.o
+obj-$(CONFIG_RTC_CV1800B) += rtc-cv1800b.o
obj-$(CONFIG_RTC_DAVINCI) += davinci.o
obj-$(CONFIG_RTC_DS1307) += ds1307.o
obj-$(CONFIG_RTC_DS1337) += ds1337.o
diff --git a/drivers/rtc/rtc-cv1800b.c b/drivers/rtc/rtc-cv1800b.c
new file mode 100644
index 00000000000..e98efb319d7
--- /dev/null
+++ b/drivers/rtc/rtc-cv1800b.c
@@ -0,0 +1,123 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (C) 2026 Zhuxu Ran <zhuxu_ran@zohomail.com>
+ *
+ * Based on the Linux driver by Jingbao Qiu <qiujingbao.dlmu@gmail.com>.
+ */
+
+#include <clk.h>
+#include <dm.h>
+#include <dm/lists.h>
+#include <regmap.h>
+#include <rtc.h>
+#include <linux/bitops.h>
+#include <linux/errno.h>
+#include <linux/err.h>
+
+#define SEC_PULSE_GEN 0x1004
+#define SET_SEC_CNTR_VAL 0x1010
+#define SET_SEC_CNTR_TRIG 0x1014
+#define SEC_CNTR_VAL 0x1018
+#define MACRO_RG_SET_T 0x1498
+
+#define SEL_SEC_PULSE BIT(31)
+
+struct cv1800b_rtc_priv {
+ struct regmap *regmap;
+ struct clk clk;
+};
+
+static int cv1800b_rtc_get(struct udevice *dev, struct rtc_time *time)
+{
+ struct cv1800b_rtc_priv *priv = dev_get_priv(dev);
+ u32 value;
+ int ret;
+
+ ret = regmap_read(priv->regmap, SEC_PULSE_GEN, &value);
+ if (ret)
+ return ret;
+ if (value & SEL_SEC_PULSE)
+ return -EINVAL;
+
+ ret = regmap_read(priv->regmap, SEC_CNTR_VAL, &value);
+ if (ret)
+ return ret;
+
+ rtc_to_tm(value, time);
+
+ return 0;
+}
+
+static int cv1800b_rtc_set(struct udevice *dev, const struct rtc_time *time)
+{
+ struct cv1800b_rtc_priv *priv = dev_get_priv(dev);
+ time64_t seconds;
+ int ret;
+
+ if (time->tm_year < 1970)
+ return -EINVAL;
+
+ seconds = rtc_mktime(time);
+ if (seconds < 0 || seconds > U32_MAX)
+ return -ERANGE;
+
+ ret = regmap_write(priv->regmap, SET_SEC_CNTR_VAL, seconds);
+ if (ret)
+ return ret;
+
+ ret = regmap_write(priv->regmap, SET_SEC_CNTR_TRIG, 1);
+ if (ret)
+ return ret;
+
+ ret = regmap_write(priv->regmap, MACRO_RG_SET_T, seconds);
+ if (ret)
+ return ret;
+
+ return regmap_update_bits(priv->regmap, SEC_PULSE_GEN,
+ SEL_SEC_PULSE, 0);
+}
+
+static int cv1800b_rtc_bind(struct udevice *dev)
+{
+ if (!CONFIG_IS_ENABLED(SYSRESET_CV1800B))
+ return 0;
+
+ return device_bind_driver_to_node(dev, "cv1800b_sysreset",
+ "sysreset", dev_ofnode(dev), NULL);
+}
+
+static int cv1800b_rtc_probe(struct udevice *dev)
+{
+ struct cv1800b_rtc_priv *priv = dev_get_priv(dev);
+ int ret;
+
+ priv->regmap = devm_regmap_init(dev, NULL, NULL, NULL);
+ if (IS_ERR(priv->regmap))
+ return PTR_ERR(priv->regmap);
+
+ ret = clk_get_by_name(dev, "rtc", &priv->clk);
+ if (ret)
+ return ret;
+
+ return clk_enable(&priv->clk);
+}
+
+static const struct rtc_ops cv1800b_rtc_ops = {
+ .get = cv1800b_rtc_get,
+ .set = cv1800b_rtc_set,
+};
+
+static const struct udevice_id cv1800b_rtc_ids[] = {
+ { .compatible = "sophgo,cv1800b-rtc" },
+ { }
+};
+
+U_BOOT_DRIVER(cv1800b_rtc) = {
+ .name = "cv1800b_rtc",
+ .id = UCLASS_RTC,
+ .of_match = cv1800b_rtc_ids,
+ .bind = cv1800b_rtc_bind,
+ .probe = cv1800b_rtc_probe,
+ .ops = &cv1800b_rtc_ops,
+ .priv_auto = sizeof(struct cv1800b_rtc_priv),
+};
--
2.55.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH v2 2/3] riscv: sophgo: Enable RTC-backed system reset
2026-10-06 15:45 [PATCH v2 0/3] rtc: cv1800b: Use the RTC node for time and system reset Zhuxu Ran
2026-10-06 15:45 ` [PATCH v2 1/3] rtc: cv1800b: Add seconds counter support Zhuxu Ran
@ 2026-10-06 15:45 ` Zhuxu Ran
2026-10-06 15:45 ` [PATCH v2 3/3] sysreset: cv1800b: Use the RTC device node for register access Zhuxu Ran
2 siblings, 0 replies; 5+ messages in thread
From: Zhuxu Ran @ 2026-10-06 15:45 UTC (permalink / raw)
To: u-boot
Cc: Yao Zi, Tom Rini, Johan Jonker, Alexander Koch, Kongyang Liu,
Hiago De Franco, Thomas Bonnefille, Quentin Schulz,
Peter Robinson, Leo Yu-Chi Liang, Casey Connolly,
Varadarajan Narayanan, Sumit Garg, Heiko Stuebner, Marek Vasut,
Marek Vasut, Ilias Apalodimas, Zhuxu Ran
Enable the CV1800B RTC driver for Milk-V Duo, Milk-V Duo 256M,
and LicheeRV Nano. Remove the board-level sysreset binding on
Milk-V Duo now that the RTC driver binds the sysreset child from
the devicetree node. Reset register access is unchanged here.
Signed-off-by: Zhuxu Ran <zhuxu_ran@zohomail.com>
---
board/sophgo/milkv_duo/board.c | 5 -----
configs/milkv_duo_256m_defconfig | 2 ++
configs/milkv_duo_defconfig | 2 ++
configs/sipeed_licheerv_nano_defconfig | 2 ++
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/board/sophgo/milkv_duo/board.c b/board/sophgo/milkv_duo/board.c
index 34339c42925..3423f54012e 100644
--- a/board/sophgo/milkv_duo/board.c
+++ b/board/sophgo/milkv_duo/board.c
@@ -3,15 +3,10 @@
* Copyright (c) 2024, Kongyang Liu <seashell11234455@gmail.com>
*/
-#include <dm/lists.h>
-
#include "../common/ethernet.h"
int board_init(void)
{
- if (IS_ENABLED(CONFIG_SYSRESET_CV1800B))
- device_bind_driver(gd->dm_root, "cv1800b_sysreset", "sysreset", NULL);
-
if (IS_ENABLED(CONFIG_NET_LEGACY))
cv1800b_ephy_init();
diff --git a/configs/milkv_duo_256m_defconfig b/configs/milkv_duo_256m_defconfig
index fda0baa3277..f15b41e1451 100644
--- a/configs/milkv_duo_256m_defconfig
+++ b/configs/milkv_duo_256m_defconfig
@@ -38,6 +38,8 @@ CONFIG_MMC_SDHCI_CV1800B=y
CONFIG_DM_MDIO=y
CONFIG_DM_MDIO_MUX=y
CONFIG_ETH_DESIGNWARE=y
+CONFIG_DM_RTC=y
+CONFIG_RTC_CV1800B=y
CONFIG_MDIO_MUX_MMIOREG=y
CONFIG_SYS_NS16550=y
CONFIG_SYS_NS16550_MEM32=y
diff --git a/configs/milkv_duo_defconfig b/configs/milkv_duo_defconfig
index 9d6b80362d5..77c8d89701d 100644
--- a/configs/milkv_duo_defconfig
+++ b/configs/milkv_duo_defconfig
@@ -35,6 +35,8 @@ CONFIG_MMC_SDHCI_ADMA=y
CONFIG_MMC_SDHCI_CV1800B=y
CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_ETH_DESIGNWARE=y
+CONFIG_DM_RTC=y
+CONFIG_RTC_CV1800B=y
CONFIG_SYS_NS16550=y
CONFIG_SYS_NS16550_MEM32=y
CONFIG_SPI=y
diff --git a/configs/sipeed_licheerv_nano_defconfig b/configs/sipeed_licheerv_nano_defconfig
index 21b8fece201..75229787d2f 100644
--- a/configs/sipeed_licheerv_nano_defconfig
+++ b/configs/sipeed_licheerv_nano_defconfig
@@ -40,6 +40,8 @@ CONFIG_MMC_SDHCI_ADMA=y
CONFIG_MMC_SDHCI_CV1800B=y
CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_ETH_DESIGNWARE=y
+CONFIG_DM_RTC=y
+CONFIG_RTC_CV1800B=y
CONFIG_SYS_NS16550=y
CONFIG_SYS_NS16550_MEM32=y
CONFIG_SPI=y
--
2.55.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH v2 3/3] sysreset: cv1800b: Use the RTC device node for register access
2026-10-06 15:45 [PATCH v2 0/3] rtc: cv1800b: Use the RTC node for time and system reset Zhuxu Ran
2026-10-06 15:45 ` [PATCH v2 1/3] rtc: cv1800b: Add seconds counter support Zhuxu Ran
2026-10-06 15:45 ` [PATCH v2 2/3] riscv: sophgo: Enable RTC-backed system reset Zhuxu Ran
@ 2026-10-06 15:45 ` Zhuxu Ran
2026-10-06 17:28 ` Hiago De Franco
2 siblings, 1 reply; 5+ messages in thread
From: Zhuxu Ran @ 2026-10-06 15:45 UTC (permalink / raw)
To: u-boot
Cc: Yao Zi, Tom Rini, Johan Jonker, Alexander Koch, Kongyang Liu,
Hiago De Franco, Thomas Bonnefille, Quentin Schulz,
Peter Robinson, Leo Yu-Chi Liang, Casey Connolly,
Varadarajan Narayanan, Sumit Garg, Heiko Stuebner, Marek Vasut,
Marek Vasut, Ilias Apalodimas, Zhuxu Ran
The CV1800B system reset driver uses hard-coded RTC register
addresses. Initialize a register map from the RTC node shared with
its parent device instead, and propagate register access errors.
Require the RTC driver that binds the sysreset child. Preserve the
existing reset requests, including the warm-reset sequence used for
SYSRESET_COLD.
Signed-off-by: Zhuxu Ran <zhuxu_ran@zohomail.com>
---
drivers/sysreset/Kconfig | 6 ++-
drivers/sysreset/sysreset_cv1800b.c | 90 +++++++++++++++++++++++--------------
2 files changed, 60 insertions(+), 36 deletions(-)
diff --git a/drivers/sysreset/Kconfig b/drivers/sysreset/Kconfig
index 16ef434a8d9..c9f2a552b47 100644
--- a/drivers/sysreset/Kconfig
+++ b/drivers/sysreset/Kconfig
@@ -60,9 +60,11 @@ config SYSRESET_CMD_POWEROFF
endif
config SYSRESET_CV1800B
- bool "Enable support for Sophgo cv1800b System Reset"
+ bool "Enable support for Sophgo CV1800B system reset"
+ depends on RTC_CV1800B
help
- Enable system reset support for Sophgo cv1800b SoC.
+ Enable system reset and power control through the RTC subsystem
+ found on Sophgo CV1800 series SoCs.
config POWEROFF_GPIO
bool "Enable support for GPIO poweroff driver"
diff --git a/drivers/sysreset/sysreset_cv1800b.c b/drivers/sysreset/sysreset_cv1800b.c
index 9cd62772ef4..fa76c8cf38e 100644
--- a/drivers/sysreset/sysreset_cv1800b.c
+++ b/drivers/sysreset/sysreset_cv1800b.c
@@ -1,64 +1,86 @@
// SPDX-License-Identifier: GPL-2.0
/*
* Copyright (c) 2024, Kongyang Liu <seashell11234455@gmail.com>
+ * Copyright (c) 2026, Zhuxu Ran <zhuxu_ran@zohomail.com>
*/
#include <dm.h>
-#include <stdbool.h>
+#include <regmap.h>
#include <sysreset.h>
-#include <wait_bit.h>
-#include <linux/io.h>
+#include <linux/bitops.h>
+#include <linux/err.h>
#include <linux/errno.h>
-#define REG_RTC_BASE (void *)0x05026000
-#define REG_RTC_CTRL_BASE (void *)0x05025000
-#define REG_RTC_EN_SHDN_REQ (REG_RTC_BASE + 0xc0)
-#define REG_RTC_EN_PWR_CYC_REQ (REG_RTC_BASE + 0xc8)
-#define REG_RTC_EN_WARM_RST_REQ (REG_RTC_BASE + 0xcc)
-#define REG_RTC_CTRL_UNLOCKKEY (REG_RTC_CTRL_BASE + 0x4)
-#define REG_RTC_CTRL (REG_RTC_CTRL_BASE + 0x8)
+#define RTC_CTRL_UNLOCKKEY 0x0004
+#define RTC_CTRL 0x0008
+#define RTC_EN_SHDN_REQ 0x10c0
+#define RTC_EN_PWR_CYC_REQ 0x10c8
+#define RTC_EN_WARM_RST_REQ 0x10cc
-#define CTRL_UNLOCKKEY_MAGIC 0xAB18
+#define CTRL_UNLOCKKEY_MAGIC 0xab18
-/* REG_RTC_CTRL */
-#define BIT_REQ_SHDN BIT(0)
-#define BIT_REQ_PWR_CYC BIT(3)
-#define BIT_REQ_WARM_RST BIT(4)
+#define BIT_REQ_SHDN BIT(0)
+#define BIT_REQ_PWR_CYC BIT(3)
+#define BIT_REQ_WARM_RST BIT(4)
-static struct {
- void *pre_req_reg;
+struct cv1800b_sysreset_priv {
+ struct regmap *regmap;
+};
+
+static const struct {
+ u32 pre_req_reg;
u32 req_bit;
} reset_info[SYSRESET_COUNT] = {
- [SYSRESET_WARM] = { REG_RTC_EN_WARM_RST_REQ, BIT_REQ_WARM_RST },
- [SYSRESET_COLD] = { REG_RTC_EN_WARM_RST_REQ, BIT_REQ_WARM_RST },
- [SYSRESET_POWER] = { REG_RTC_EN_PWR_CYC_REQ, BIT_REQ_PWR_CYC },
- [SYSRESET_POWER_OFF] = { REG_RTC_EN_SHDN_REQ, BIT_REQ_SHDN },
+ [SYSRESET_WARM] = { RTC_EN_WARM_RST_REQ, BIT_REQ_WARM_RST },
+ [SYSRESET_COLD] = { RTC_EN_WARM_RST_REQ, BIT_REQ_WARM_RST },
+ [SYSRESET_POWER] = { RTC_EN_PWR_CYC_REQ, BIT_REQ_PWR_CYC },
+ [SYSRESET_POWER_OFF] = { RTC_EN_SHDN_REQ, BIT_REQ_SHDN },
};
static int cv1800b_sysreset_request(struct udevice *dev, enum sysreset_t type)
{
- u32 reg;
+ struct cv1800b_sysreset_priv *priv = dev_get_priv(dev);
+ int ret;
+
+ if (type >= SYSRESET_COUNT)
+ return -EINVAL;
- writel(1, reset_info[type].pre_req_reg);
- writel(CTRL_UNLOCKKEY_MAGIC, REG_RTC_CTRL_UNLOCKKEY);
- reg = readl(REG_RTC_CTRL);
- writel(0xFFFF0800 | reset_info[type].req_bit, REG_RTC_CTRL);
+ ret = regmap_write(priv->regmap, reset_info[type].pre_req_reg, 1);
+ if (ret)
+ return ret;
+
+ ret = regmap_write(priv->regmap, RTC_CTRL_UNLOCKKEY,
+ CTRL_UNLOCKKEY_MAGIC);
+ if (ret)
+ return ret;
+
+ ret = regmap_write(priv->regmap, RTC_CTRL,
+ 0xffff0800 | reset_info[type].req_bit);
+ if (ret)
+ return ret;
return -EINPROGRESS;
}
+static int cv1800b_sysreset_probe(struct udevice *dev)
+{
+ struct cv1800b_sysreset_priv *priv = dev_get_priv(dev);
+
+ priv->regmap = devm_regmap_init(dev, NULL, NULL, NULL);
+ if (IS_ERR(priv->regmap))
+ return PTR_ERR(priv->regmap);
+
+ return 0;
+}
+
static struct sysreset_ops cv1800b_sysreset = {
.request = cv1800b_sysreset_request,
};
-static const struct udevice_id cv1800b_sysreset_ids[] = {
- { .compatible = "sophgo,cv1800b-sysreset", },
- {},
-};
-
U_BOOT_DRIVER(sysreset_cv1800b) = {
.name = "cv1800b_sysreset",
- .id = UCLASS_SYSRESET,
- .ops = &cv1800b_sysreset,
- .of_match = cv1800b_sysreset_ids
+ .id = UCLASS_SYSRESET,
+ .probe = cv1800b_sysreset_probe,
+ .ops = &cv1800b_sysreset,
+ .priv_auto = sizeof(struct cv1800b_sysreset_priv),
};
--
2.55.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH v2 3/3] sysreset: cv1800b: Use the RTC device node for register access
2026-10-06 15:45 ` [PATCH v2 3/3] sysreset: cv1800b: Use the RTC device node for register access Zhuxu Ran
@ 2026-10-06 17:28 ` Hiago De Franco
0 siblings, 0 replies; 5+ messages in thread
From: Hiago De Franco @ 2026-10-06 17:28 UTC (permalink / raw)
To: Zhuxu Ran
Cc: u-boot, Yao Zi, Tom Rini, Johan Jonker, Alexander Koch,
Kongyang Liu, Thomas Bonnefille, Quentin Schulz, Peter Robinson,
Leo Yu-Chi Liang, Casey Connolly, Varadarajan Narayanan,
Sumit Garg, Heiko Stuebner, Marek Vasut, Marek Vasut,
Ilias Apalodimas
On Tue, Oct 06, 2026 at 11:45:08PM +0800, Zhuxu Ran wrote:
> The CV1800B system reset driver uses hard-coded RTC register
> addresses. Initialize a register map from the RTC node shared with
> its parent device instead, and propagate register access errors.
> Require the RTC driver that binds the sysreset child. Preserve the
> existing reset requests, including the warm-reset sequence used for
> SYSRESET_COLD.
>
> Signed-off-by: Zhuxu Ran <zhuxu_ran@zohomail.com>
> ---
> drivers/sysreset/Kconfig | 6 ++-
> drivers/sysreset/sysreset_cv1800b.c | 90 +++++++++++++++++++++++--------------
> 2 files changed, 60 insertions(+), 36 deletions(-)
>
> diff --git a/drivers/sysreset/Kconfig b/drivers/sysreset/Kconfig
> index 16ef434a8d9..c9f2a552b47 100644
> --- a/drivers/sysreset/Kconfig
> +++ b/drivers/sysreset/Kconfig
> @@ -60,9 +60,11 @@ config SYSRESET_CMD_POWEROFF
> endif
>
> config SYSRESET_CV1800B
> - bool "Enable support for Sophgo cv1800b System Reset"
> + bool "Enable support for Sophgo CV1800B system reset"
> + depends on RTC_CV1800B
> help
> - Enable system reset support for Sophgo cv1800b SoC.
> + Enable system reset and power control through the RTC subsystem
> + found on Sophgo CV1800 series SoCs.
>
> config POWEROFF_GPIO
> bool "Enable support for GPIO poweroff driver"
> diff --git a/drivers/sysreset/sysreset_cv1800b.c b/drivers/sysreset/sysreset_cv1800b.c
> index 9cd62772ef4..fa76c8cf38e 100644
> --- a/drivers/sysreset/sysreset_cv1800b.c
> +++ b/drivers/sysreset/sysreset_cv1800b.c
> @@ -1,64 +1,86 @@
> // SPDX-License-Identifier: GPL-2.0
> /*
> * Copyright (c) 2024, Kongyang Liu <seashell11234455@gmail.com>
> + * Copyright (c) 2026, Zhuxu Ran <zhuxu_ran@zohomail.com>
> */
>
> #include <dm.h>
> -#include <stdbool.h>
> +#include <regmap.h>
> #include <sysreset.h>
> -#include <wait_bit.h>
> -#include <linux/io.h>
> +#include <linux/bitops.h>
> +#include <linux/err.h>
> #include <linux/errno.h>
>
> -#define REG_RTC_BASE (void *)0x05026000
> -#define REG_RTC_CTRL_BASE (void *)0x05025000
> -#define REG_RTC_EN_SHDN_REQ (REG_RTC_BASE + 0xc0)
> -#define REG_RTC_EN_PWR_CYC_REQ (REG_RTC_BASE + 0xc8)
> -#define REG_RTC_EN_WARM_RST_REQ (REG_RTC_BASE + 0xcc)
> -#define REG_RTC_CTRL_UNLOCKKEY (REG_RTC_CTRL_BASE + 0x4)
> -#define REG_RTC_CTRL (REG_RTC_CTRL_BASE + 0x8)
> +#define RTC_CTRL_UNLOCKKEY 0x0004
> +#define RTC_CTRL 0x0008
> +#define RTC_EN_SHDN_REQ 0x10c0
Looks like the tabs for 0x10c0 are not correct.
> +#define RTC_EN_PWR_CYC_REQ 0x10c8
> +#define RTC_EN_WARM_RST_REQ 0x10cc
>
> -#define CTRL_UNLOCKKEY_MAGIC 0xAB18
> +#define CTRL_UNLOCKKEY_MAGIC 0xab18
This line change is purely cosmetic. I think it is fine since you are
changing all the other addresses, but I just wanted to highligth it.
>
> -/* REG_RTC_CTRL */
> -#define BIT_REQ_SHDN BIT(0)
> -#define BIT_REQ_PWR_CYC BIT(3)
> -#define BIT_REQ_WARM_RST BIT(4)
> +#define BIT_REQ_SHDN BIT(0)
> +#define BIT_REQ_PWR_CYC BIT(3)
Same here, looks like the tabs for BIT(3) are not correct.
> +#define BIT_REQ_WARM_RST BIT(4)
>
> -static struct {
> - void *pre_req_reg;
> +struct cv1800b_sysreset_priv {
> + struct regmap *regmap;
> +};
> +
> +static const struct {
> + u32 pre_req_reg;
> u32 req_bit;
> } reset_info[SYSRESET_COUNT] = {
> - [SYSRESET_WARM] = { REG_RTC_EN_WARM_RST_REQ, BIT_REQ_WARM_RST },
> - [SYSRESET_COLD] = { REG_RTC_EN_WARM_RST_REQ, BIT_REQ_WARM_RST },
> - [SYSRESET_POWER] = { REG_RTC_EN_PWR_CYC_REQ, BIT_REQ_PWR_CYC },
> - [SYSRESET_POWER_OFF] = { REG_RTC_EN_SHDN_REQ, BIT_REQ_SHDN },
> + [SYSRESET_WARM] = { RTC_EN_WARM_RST_REQ, BIT_REQ_WARM_RST },
> + [SYSRESET_COLD] = { RTC_EN_WARM_RST_REQ, BIT_REQ_WARM_RST },
> + [SYSRESET_POWER] = { RTC_EN_PWR_CYC_REQ, BIT_REQ_PWR_CYC },
> + [SYSRESET_POWER_OFF] = { RTC_EN_SHDN_REQ, BIT_REQ_SHDN },
> };
>
> static int cv1800b_sysreset_request(struct udevice *dev, enum sysreset_t type)
> {
> - u32 reg;
> + struct cv1800b_sysreset_priv *priv = dev_get_priv(dev);
> + int ret;
> +
> + if (type >= SYSRESET_COUNT)
> + return -EINVAL;
>
> - writel(1, reset_info[type].pre_req_reg);
> - writel(CTRL_UNLOCKKEY_MAGIC, REG_RTC_CTRL_UNLOCKKEY);
> - reg = readl(REG_RTC_CTRL);
> - writel(0xFFFF0800 | reset_info[type].req_bit, REG_RTC_CTRL);
> + ret = regmap_write(priv->regmap, reset_info[type].pre_req_reg, 1);
> + if (ret)
> + return ret;
> +
> + ret = regmap_write(priv->regmap, RTC_CTRL_UNLOCKKEY,
> + CTRL_UNLOCKKEY_MAGIC);
> + if (ret)
> + return ret;
> +
> + ret = regmap_write(priv->regmap, RTC_CTRL,
> + 0xffff0800 | reset_info[type].req_bit);
> + if (ret)
> + return ret;
>
> return -EINPROGRESS;
> }
>
> +static int cv1800b_sysreset_probe(struct udevice *dev)
> +{
> + struct cv1800b_sysreset_priv *priv = dev_get_priv(dev);
> +
> + priv->regmap = devm_regmap_init(dev, NULL, NULL, NULL);
> + if (IS_ERR(priv->regmap))
> + return PTR_ERR(priv->regmap);
> +
> + return 0;
> +}
> +
> static struct sysreset_ops cv1800b_sysreset = {
> .request = cv1800b_sysreset_request,
> };
>
> -static const struct udevice_id cv1800b_sysreset_ids[] = {
> - { .compatible = "sophgo,cv1800b-sysreset", },
> - {},
> -};
> -
> U_BOOT_DRIVER(sysreset_cv1800b) = {
> .name = "cv1800b_sysreset",
> - .id = UCLASS_SYSRESET,
> - .ops = &cv1800b_sysreset,
> - .of_match = cv1800b_sysreset_ids
> + .id = UCLASS_SYSRESET,
> + .probe = cv1800b_sysreset_probe,
> + .ops = &cv1800b_sysreset,
> + .priv_auto = sizeof(struct cv1800b_sysreset_priv),
> };
>
> --
> 2.55.0
>
Best regards,
--
Hiago
^ permalink raw reply [flat|nested] 5+ messages in thread