Merge branch 'master' into next

[platform/kernel/u-boot.git] / drivers / clk / renesas / clk-rcar-gen3.c

diff --git a/drivers/clk/renesas/clk-rcar-gen3.c b/drivers/clk/renesas/clk-rcar-gen3.c
index 9545e0a..1697867 100644 (file)
--- 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]);