diff options
| author | Ingo Molnar <mingo@kernel.org> | 2020-01-20 08:42:47 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-01-20 08:42:47 +0100 |
| commit | 837171fe77d700222bb75ef5fe26f4785fcd9e99 (patch) | |
| tree | 3d73dc7328db9636f0ac0e11961ec031647ed39d /drivers/clk/sunxi-ng/ccu-sun8i-r40.c | |
| parent | c29a59e43829beabc4c26036ebcc6a32dd0b6a01 (diff) | |
| parent | def9d2780727cec3313ed3522d0123158d87224d (diff) | |
Merge tag 'v5.5-rc7' into locking/kcsan, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/clk/sunxi-ng/ccu-sun8i-r40.c')
| -rw-r--r-- | drivers/clk/sunxi-ng/ccu-sun8i-r40.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/clk/sunxi-ng/ccu-sun8i-r40.c b/drivers/clk/sunxi-ng/ccu-sun8i-r40.c index 897490800102..23bfe1d12f21 100644 --- a/drivers/clk/sunxi-ng/ccu-sun8i-r40.c +++ b/drivers/clk/sunxi-ng/ccu-sun8i-r40.c @@ -761,7 +761,8 @@ static struct ccu_mp outa_clk = { .reg = 0x1f0, .features = CCU_FEATURE_FIXED_PREDIV, .hw.init = CLK_HW_INIT_PARENTS("outa", out_parents, - &ccu_mp_ops, 0), + &ccu_mp_ops, + CLK_SET_RATE_PARENT), } }; @@ -779,7 +780,8 @@ static struct ccu_mp outb_clk = { .reg = 0x1f4, .features = CCU_FEATURE_FIXED_PREDIV, .hw.init = CLK_HW_INIT_PARENTS("outb", out_parents, - &ccu_mp_ops, 0), + &ccu_mp_ops, + CLK_SET_RATE_PARENT), } }; |