Convert to use the rockchip_sysreset_bind() helper to bind the rockchip_sysreset driver. Also add and use a CRU base address constant based on the clock-controller address used in the SoC device tree.
Signed-off-by: Jonas Karlman <[email protected]> --- .../arm/include/asm/arch-rockchip/cru_rk3368.h | 2 ++ drivers/clk/rockchip/clk_rk3368.c | 18 +++++------------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3368.h b/arch/arm/include/asm/arch-rockchip/cru_rk3368.h index ed2a61218552..bc6beb60ca11 100644 --- a/arch/arm/include/asm/arch-rockchip/cru_rk3368.h +++ b/arch/arm/include/asm/arch-rockchip/cru_rk3368.h @@ -54,6 +54,8 @@ struct rk3368_clk_priv { struct rk3368_cru *cru; }; +#define RK3368_CRU_BASE 0xff760000 + enum { /* PLL CON0 */ PLL_NR_SHIFT = 8, diff --git a/drivers/clk/rockchip/clk_rk3368.c b/drivers/clk/rockchip/clk_rk3368.c index 630253fbb1df..695e72ff3177 100644 --- a/drivers/clk/rockchip/clk_rk3368.c +++ b/drivers/clk/rockchip/clk_rk3368.c @@ -607,22 +607,14 @@ static int rk3368_clk_of_to_plat(struct udevice *dev) static int rk3368_clk_bind(struct udevice *dev) { int ret; - struct udevice *sys_child; - struct sysreset_reg *priv; /* The reset driver does not have a device node, so bind it here */ - ret = device_bind_driver(dev, "rockchip_sysreset", "sysreset", - &sys_child); - if (ret) { + ret = rockchip_sysreset_bind(dev, RK3368_CRU_BASE, + offsetof(struct rk3368_cru, glb_rst_st), + offsetof(struct rk3368_cru, glb_srst_fst_val), + offsetof(struct rk3368_cru, glb_srst_snd_val)); + if (ret) debug("Warning: No sysreset driver: ret=%d\n", ret); - } else { - priv = malloc(sizeof(struct sysreset_reg)); - priv->glb_srst_fst_value = offsetof(struct rk3368_cru, - glb_srst_fst_val); - priv->glb_srst_snd_value = offsetof(struct rk3368_cru, - glb_srst_snd_val); - dev_set_priv(sys_child, priv); - } #if CONFIG_IS_ENABLED(RESET_ROCKCHIP) ret = offsetof(struct rk3368_cru, softrst_con[0]); -- 2.54.0
