diff options
| author | Tom Rini <trini@konsulko.com> | 2023-03-21 11:52:55 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-03-21 11:52:55 -0400 |
| commit | e37be8484f025137d5073406641b1c731c19b3e1 (patch) | |
| tree | 0725834cec0dcb2f48d295843c47386e8bc19a72 | |
| parent | 51321493ebf029a9c3b33c02104f20fd5cb3a9be (diff) | |
| parent | afafaa2a8f3f0ef38fc55c5d830890adb508549f (diff) | |
| download | u-boot-e37be8484f025137d5073406641b1c731c19b3e1.zip u-boot-e37be8484f025137d5073406641b1c731c19b3e1.tar.gz u-boot-e37be8484f025137d5073406641b1c731c19b3e1.tar.bz2 | |
Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-sh
A single reset controller driver (part of the clock driver) fix
for v2023.04 release.
| -rw-r--r-- | drivers/clk/renesas/clk-rcar-gen3.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/clk/renesas/clk-rcar-gen3.c b/drivers/clk/renesas/clk-rcar-gen3.c index d778db6..c121d82 100644 --- a/drivers/clk/renesas/clk-rcar-gen3.c +++ b/drivers/clk/renesas/clk-rcar-gen3.c @@ -479,8 +479,9 @@ static int gen3_reset_assert(struct reset_ctl *reset_ctl) { struct udevice *cdev = (struct udevice *)dev_get_driver_data(reset_ctl->dev); struct gen3_clk_priv *priv = dev_get_priv(cdev); - unsigned int reg = reset_ctl->id / 32; - unsigned int bit = reset_ctl->id % 32; + unsigned int packed_id = MOD_CLK_PACK(reset_ctl->id); + unsigned int reg = packed_id / 32; + unsigned int bit = packed_id % 32; u32 bitmask = BIT(bit); writel(bitmask, priv->base + priv->info->reset_regs[reg]); @@ -492,8 +493,9 @@ static int gen3_reset_deassert(struct reset_ctl *reset_ctl) { struct udevice *cdev = (struct udevice *)dev_get_driver_data(reset_ctl->dev); struct gen3_clk_priv *priv = dev_get_priv(cdev); - unsigned int reg = reset_ctl->id / 32; - unsigned int bit = reset_ctl->id % 32; + unsigned int packed_id = MOD_CLK_PACK(reset_ctl->id); + unsigned int reg = packed_id / 32; + unsigned int bit = packed_id % 32; u32 bitmask = BIT(bit); writel(bitmask, priv->base + priv->info->reset_clear_regs[reg]); |