diff options
| author | Weiyi Lu <weiyi.lu@mediatek.com> | 2019-04-12 05:30:27 +0200 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2019-04-12 18:41:49 +0200 |
| commit | b3cf181c65c4d49f86b67b399fe7203ecac730a9 (patch) | |
| tree | 3bb5b4d2afaad2686353e38e2b6a7157db0d3e52 /drivers/clk | |
| parent | platform/x86: pmc_atom: Drop __initconst on dmi table (diff) | |
| download | linux-b3cf181c65c4d49f86b67b399fe7203ecac730a9.tar.xz linux-b3cf181c65c4d49f86b67b399fe7203ecac730a9.zip | |
clk: mediatek: fix clk-gate flag setting
CLK_SET_RATE_PARENT would be dropped.
Merge two flag setting together to correct the error.
Fixes: 5a1cc4c27ad2 ("clk: mediatek: Add flags to mtk_gate")
Cc: <stable@vger.kernel.org>
Signed-off-by: Weiyi Lu <weiyi.lu@mediatek.com>
Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Diffstat (limited to 'drivers/clk')
| -rw-r--r-- | drivers/clk/mediatek/clk-gate.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/clk/mediatek/clk-gate.c b/drivers/clk/mediatek/clk-gate.c index 9628d4e7690b..85daf826619a 100644 --- a/drivers/clk/mediatek/clk-gate.c +++ b/drivers/clk/mediatek/clk-gate.c @@ -169,11 +169,10 @@ struct clk *mtk_clk_register_gate( return ERR_PTR(-ENOMEM); init.name = name; - init.flags = CLK_SET_RATE_PARENT; + init.flags = flags | CLK_SET_RATE_PARENT; init.parent_names = parent_name ? &parent_name : NULL; init.num_parents = parent_name ? 1 : 0; init.ops = ops; - init.flags = flags; cg->regmap = regmap; cg->set_ofs = set_ofs; |