2019-02-15 00:54:32

by Matthias Brugger

Subject: [PATCH v4 1/3] clk: mediatek: Add MUX_FLAGS macro

From: Jasper Mattsson <[email protected]>

This is required to mark outputs of certain MUXes as CLK_IS_CRITICAL.

Signed-off-by: Jasper Mattsson <[email protected]>
Acked-by: Mars Cheng <[email protected]>
Signed-off-by: Matthias Brugger <[email protected]>
---
drivers/clk/mediatek/clk-mtk.h | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/clk/mediatek/clk-mtk.h b/drivers/clk/mediatek/clk-mtk.h
index f83c2bbb677e..daab6ee94788 100644
--- a/drivers/clk/mediatek/clk-mtk.h
+++ b/drivers/clk/mediatek/clk-mtk.h
@@ -111,7 +111,11 @@ struct mtk_composite {
MUX_GATE_FLAGS(_id, _name, _parents, _reg, _shift, _width, \
_gate, CLK_SET_RATE_PARENT)

-#define MUX(_id, _name, _parents, _reg, _shift, _width) { \
+#define MUX(_id, _name, _parents, _reg, _shift, _width) \
+ MUX_FLAGS(_id, _name, _parents, _reg, \
+ _shift, _width, CLK_SET_RATE_PARENT)
+
+#define MUX_FLAGS(_id, _name, _parents, _reg, _shift, _width, _flags) { \
.id = _id, \
.name = _name, \
.mux_reg = _reg, \
@@ -121,7 +125,7 @@ struct mtk_composite {
.divider_shift = -1, \
.parent_names = _parents, \
.num_parents = ARRAY_SIZE(_parents), \
- .flags = CLK_SET_RATE_PARENT, \
+ .flags = _flags, \
}

#define DIV_GATE(_id, _name, _parent, _gate_reg, _gate_shift, _div_reg, \
--
2.20.1

2019-02-26 17:54:46

by Stephen Boyd

Subject: Re: [PATCH v4 1/3] clk: mediatek: Add MUX_FLAGS macro

Quoting [email protected] (2019-02-14 08:32:18)
> From: Jasper Mattsson <[email protected]>
>
> This is required to mark outputs of certain MUXes as CLK_IS_CRITICAL.
>
> Signed-off-by: Jasper Mattsson <[email protected]>
> Acked-by: Mars Cheng <[email protected]>
> Signed-off-by: Matthias Brugger <[email protected]>
> ---

Applied to clk-next