Message ID | 20190412033027.3516-1-weiyi.lu@mediatek.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [v1] clk: mediatek: fix clk-gate flag setting | expand |
On 12/04/2019 05:30, Weiyi Lu wrote: > 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> Good catch. Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com> > --- > drivers/clk/mediatek/clk-gate.c | 3 +-- > 1 file changed, 1 insertion(+), 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; >
Quoting Weiyi Lu (2019-04-11 20:30:27) > 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> > --- Applied to clk-fixes
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;
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> --- drivers/clk/mediatek/clk-gate.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)