Commit 610a5d83 authored by Rajan Vaja's avatar Rajan Vaja Committed by Stephen Boyd
Browse files

clk: zynqmp: Use firmware specific common clock flags 



Currently firmware passes CCF specific flags to ZynqMP clock driver.
So firmware needs to be updated if CCF flags are changed. The firmware
should have its own 'flag number space' that is distinct from the
common clk framework's 'flag number space'. So define and use ZynqMP
specific common clock flags instead of using CCF flags.

Signed-off-by: default avatarRajan Vaja <rajan.vaja@xilinx.com>
Link: https://lore.kernel.org/r/20210628070122.26217-2-rajan.vaja@xilinx.com


Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent b9ec1c1f

drivers/clk/zynqmp/clk-gate-zynqmp.c

+3 −1
Original line number Diff line number Diff line
@@ -121,7 +121,9 @@ struct clk_hw *zynqmp_clk_register_gate(const char *name, u32 clk_id, 


	init.name = name;

	init.ops = &zynqmp_clk_gate_ops;

	init.flags = nodes->flag;



	init.flags = zynqmp_clk_map_common_ccf_flags(nodes->flag);



	init.parent_names = parents;

	init.num_parents = 1;

drivers/clk/zynqmp/clk-mux-zynqmp.c

+3 −1
Original line number Diff line number Diff line
@@ -126,7 +126,9 @@ struct clk_hw *zynqmp_clk_register_mux(const char *name, u32 clk_id, 
		init.ops = &zynqmp_clk_mux_ro_ops;

	else

		init.ops = &zynqmp_clk_mux_ops;

	init.flags = nodes->flag;



	init.flags = zynqmp_clk_map_common_ccf_flags(nodes->flag);



	init.parent_names = parents;

	init.num_parents = num_parents;

	mux->flags = nodes->type_flag;

drivers/clk/zynqmp/clk-zynqmp.h

+16 −0
Original line number Diff line number Diff line
@@ -10,6 +10,20 @@ 


#include <linux/firmware/xlnx-zynqmp.h>



/* Common Flags */

/* must be gated across rate change */

#define ZYNQMP_CLK_SET_RATE_GATE	BIT(0)

/* must be gated across re-parent */

#define ZYNQMP_CLK_SET_PARENT_GATE	BIT(1)

/* propagate rate change up one level */

#define ZYNQMP_CLK_SET_RATE_PARENT	BIT(2)

/* do not gate even if unused */

#define ZYNQMP_CLK_IGNORE_UNUSED	BIT(3)

/* don't re-parent on rate change */

#define ZYNQMP_CLK_SET_RATE_NO_REPARENT	BIT(7)

/* do not gate, ever */

#define ZYNQMP_CLK_IS_CRITICAL		BIT(11)



enum topology_type {

	TYPE_INVALID,

	TYPE_MUX,
@@ -33,6 +47,8 @@ struct clock_topology { 
	u8 custom_type_flag;

};



unsigned long zynqmp_clk_map_common_ccf_flags(const u32 zynqmp_flag);



struct clk_hw *zynqmp_clk_register_pll(const char *name, u32 clk_id,

				       const char * const *parents,

				       u8 num_parents,

drivers/clk/zynqmp/clkc.c

+24 −1
Original line number Diff line number Diff line
@@ -271,6 +271,26 @@ static int zynqmp_pm_clock_get_topology(u32 clock_id, u32 index, 
	return ret;

}



unsigned long zynqmp_clk_map_common_ccf_flags(const u32 zynqmp_flag)

{

	unsigned long ccf_flag = 0;



	if (zynqmp_flag & ZYNQMP_CLK_SET_RATE_GATE)

		ccf_flag |= CLK_SET_RATE_GATE;

	if (zynqmp_flag & ZYNQMP_CLK_SET_PARENT_GATE)

		ccf_flag |= CLK_SET_PARENT_GATE;

	if (zynqmp_flag & ZYNQMP_CLK_SET_RATE_PARENT)

		ccf_flag |= CLK_SET_RATE_PARENT;

	if (zynqmp_flag & ZYNQMP_CLK_IGNORE_UNUSED)

		ccf_flag |= CLK_IGNORE_UNUSED;

	if (zynqmp_flag & ZYNQMP_CLK_SET_RATE_NO_REPARENT)

		ccf_flag |= CLK_SET_RATE_NO_REPARENT;

	if (zynqmp_flag & ZYNQMP_CLK_IS_CRITICAL)

		ccf_flag |= CLK_IS_CRITICAL;



	return ccf_flag;

}



/**

 * zynqmp_clk_register_fixed_factor() - Register fixed factor with the

 *					clock framework
@@ -292,6 +312,7 @@ struct clk_hw *zynqmp_clk_register_fixed_factor(const char *name, u32 clk_id, 
	struct zynqmp_pm_query_data qdata = {0};

	u32 ret_payload[PAYLOAD_ARG_CNT];

	int ret;

	unsigned long flag;



	qdata.qid = PM_QID_CLOCK_GET_FIXEDFACTOR_PARAMS;

	qdata.arg1 = clk_id;
@@ -303,9 +324,11 @@ struct clk_hw *zynqmp_clk_register_fixed_factor(const char *name, u32 clk_id, 
	mult = ret_payload[1];

	div = ret_payload[2];



	flag = zynqmp_clk_map_common_ccf_flags(nodes->flag);



	hw = clk_hw_register_fixed_factor(NULL, name,

					  parents[0],

					  nodes->flag, mult,

					  flag, mult,

					  div);



	return hw;

drivers/clk/zynqmp/divider.c

+3 −2
Original line number Diff line number Diff line
@@ -312,8 +312,9 @@ struct clk_hw *zynqmp_clk_register_divider(const char *name, 


	init.name = name;

	init.ops = &zynqmp_clk_divider_ops;

	/* CLK_FRAC is not defined in the common clk framework */

	init.flags = nodes->flag & ~CLK_FRAC;



	init.flags = zynqmp_clk_map_common_ccf_flags(nodes->flag);



	init.parent_names = parents;

	init.num_parents = 1;