From: Rajan Vaja <[email protected]> Use ZynqMP specific mux clock flags instead of using CCF flags.
Signed-off-by: Rajan Vaja <[email protected]> Signed-off-by: Tejas Patel <[email protected]> Signed-off-by: Amit Sunil Dhamne <[email protected]> --- drivers/clk/zynqmp/clk-mux-zynqmp.c | 14 +++++++++++++- drivers/clk/zynqmp/clk-zynqmp.h | 8 ++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/drivers/clk/zynqmp/clk-mux-zynqmp.c b/drivers/clk/zynqmp/clk-mux-zynqmp.c index 1dc17a0..10cf021 100644 --- a/drivers/clk/zynqmp/clk-mux-zynqmp.c +++ b/drivers/clk/zynqmp/clk-mux-zynqmp.c @@ -125,7 +125,19 @@ struct clk_hw *zynqmp_clk_register_mux(const char *name, u32 clk_id, init.parent_names = parents; init.num_parents = num_parents; - mux->flags = nodes->type_flag; + mux->flags = 0; + mux->flags |= (nodes->type_flag & ZYNQMP_CLK_MUX_INDEX_ONE) ? + CLK_MUX_INDEX_ONE : 0; + mux->flags |= (nodes->type_flag & ZYNQMP_CLK_MUX_INDEX_BIT) ? + CLK_MUX_INDEX_BIT : 0; + mux->flags |= (nodes->type_flag & ZYNQMP_CLK_MUX_HIWORD_MASK) ? + CLK_MUX_HIWORD_MASK : 0; + mux->flags |= (nodes->type_flag & ZYNQMP_CLK_MUX_READ_ONLY) ? + CLK_MUX_READ_ONLY : 0; + mux->flags |= (nodes->type_flag & ZYNQMP_CLK_MUX_ROUND_CLOSEST) ? + CLK_MUX_ROUND_CLOSEST : 0; + mux->flags |= (nodes->type_flag & ZYNQMP_CLK_MUX_BIG_ENDIAN) ? + CLK_MUX_BIG_ENDIAN : 0; mux->hw.init = &init; mux->clk_id = clk_id; diff --git a/drivers/clk/zynqmp/clk-zynqmp.h b/drivers/clk/zynqmp/clk-zynqmp.h index ec33525..b1ac7e8 100644 --- a/drivers/clk/zynqmp/clk-zynqmp.h +++ b/drivers/clk/zynqmp/clk-zynqmp.h @@ -41,6 +41,14 @@ #define ZYNQMP_CLK_DIVIDER_READ_ONLY BIT(5) #define ZYNQMP_CLK_DIVIDER_MAX_AT_ZERO BIT(6) +/* Type Flags for mux clock */ +#define ZYNQMP_CLK_MUX_INDEX_ONE BIT(0) +#define ZYNQMP_CLK_MUX_INDEX_BIT BIT(1) +#define ZYNQMP_CLK_MUX_HIWORD_MASK BIT(2) +#define ZYNQMP_CLK_MUX_READ_ONLY BIT(3) +#define ZYNQMP_CLK_MUX_ROUND_CLOSEST BIT(4) +#define ZYNQMP_CLK_MUX_BIG_ENDIAN BIT(5) + enum topology_type { TYPE_INVALID, TYPE_MUX, -- 2.7.4 This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately.
